diff --git a/build.sh b/build.sh
index 76097d52..1ad3360e 100755
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,10 @@
 PREFIX="/usr"
 
 case "$1" in
+  "--release"|"release")
+    ./configure --prefix="$PREFIX"
+    ;;
+
   "--debug"|"debug")
     ./configure --prefix="$PREFIX" CPPFLAGS="-DDEBUG" CXXFLAGS="-g -O0 -DDEBUG -W -Wall -pedantic"
     ;;
@@ -24,22 +28,18 @@ case "$1" in
     ./configure --prefix="$PREFIX" CXXFLAGS="-fprofile-arcs -ftest-coverage"
     ;;
 
-  "--release"|"release")
-    ./configure --prefix="$PREFIX"
-    ;;
-
   "--help"|"help"|*)
     echo "Usage:"
     echo "  $(basename "$0") {COMMAND}"
     echo ""
     echo "Commands:"
-    echo "  help          Show this help"
+    echo "  release       Compile for release"
     echo "  debug         Compile with debug option"
     echo "  fulldebug     Compile with all warning options"
     echo "  profile       Compile with profile option (analysis with gprof)"
     echo "  cpu-profiler  Link with Google cpu performance profiler"
     echo "  gcov          Compile with options for coverage analysis with gcov"
-    echo "  release       Compile for release"
+    echo "  help          Show this help"
     exit 1
     ;;
 esac
diff --git a/debian/libfinal0.install b/debian/libfinal0.install
index f6ad6892..eb577ae5 100644
--- a/debian/libfinal0.install
+++ b/debian/libfinal0.install
@@ -1,2 +1,3 @@
+usr/lib/*/lib*.so
 usr/lib/*/lib*.so.*
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 78851f79..8973f59a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,8 +89,9 @@ finalcutinclude_HEADERS = \
 	fstatusbar.h \
 	fstring.h \
 	ftcap_map.h \
+	ftermcap.h \
 	fterm.h \
-	fvterm.cpp \
+	fvterm.h \
 	ftextview.h \
 	ftogglebutton.h \
 	fwidget.h \
diff --git a/src/Makefile.clang b/src/Makefile.clang
index 133202ee..8f8eb7fb 100644
--- a/src/Makefile.clang
+++ b/src/Makefile.clang
@@ -38,6 +38,7 @@ INCLUDE_HEADERS = \
 	fscrollview.h \
 	fstatusbar.h \
 	fstring.h \
+	ftermcap.h \
 	fterm.h \
 	fvterm.h \
 	ftextview.h \
diff --git a/src/Makefile.gcc b/src/Makefile.gcc
index aed9ec36..d0ac059f 100644
--- a/src/Makefile.gcc
+++ b/src/Makefile.gcc
@@ -38,6 +38,7 @@ INCLUDE_HEADERS = \
 	fscrollview.h \
 	fstatusbar.h \
 	fstring.h \
+	ftermcap.h \
 	fterm.h \
 	fvterm.h \
 	ftextview.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index 622114ce..de9d13e8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -452,8 +452,9 @@ finalcutinclude_HEADERS = \
 	fstatusbar.h \
 	fstring.h \
 	ftcap_map.h \
+	ftermcap.h \
 	fterm.h \
-	fvterm.cpp \
+	fvterm.h \
 	ftextview.h \
 	ftogglebutton.h \
 	fwidget.h \
diff --git a/test/Makefile.clang b/test/Makefile.clang
index 79158eb3..7ef3f7cf 100644
--- a/test/Makefile.clang
+++ b/test/Makefile.clang
@@ -12,7 +12,7 @@ OBJS = $(SRCS:%.cpp=%)
 CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
 MAKEFILE = -f Makefile.clang
 LDFLAGS = -L../src -lfinal
-INCLUDES = -I../src
+INCLUDES = -I../src -I/usr/include/final/
 RM = rm -f
 
 ifdef DEBUG
diff --git a/test/Makefile.gcc b/test/Makefile.gcc
index 2c5d968a..e3a546ce 100644
--- a/test/Makefile.gcc
+++ b/test/Makefile.gcc
@@ -12,7 +12,7 @@ OBJS = $(SRCS:%.cpp=%)
 CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
 MAKEFILE = -f Makefile.gcc
 LDFLAGS = -L../src -lfinal
-INCLUDES = -I../src
+INCLUDES = -I../src -I/usr/include/final/
 RM = rm -f
 
 ifdef DEBUG