diff --git a/Makefile.am b/Makefile.am
index 4e8dafe8..fe0b2fb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,4 +8,5 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src doc test
 
+docdir = ${datadir}/doc/${PACKAGE}
 doc_DATA = AUTHORS COPYING ChangeLog
diff --git a/Makefile.in b/Makefile.in
index 4d484240..7b7f0223 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -316,7 +316,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = @docdir@
+docdir = ${datadir}/doc/${PACKAGE}
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
diff --git a/autogen.sh b/autogen.sh
index c1e39859..86e469e5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,6 +15,9 @@ libtoolize --copy
 # Generate Makefile.in from Makefile.am
 automake --add-missing --copy
 
+# Update generated configuration files
+#autoreconf -v --install --force
+
 echo
 echo 'run "./configure ; make"'
 echo
diff --git a/configure b/configure
index dd9479c0..039ff059 100755
--- a/configure
+++ b/configure
@@ -4754,6 +4754,63 @@ if test "$ac_res" != no; then :
 
 fi
 
+# Checks for 'tparm'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tparm" >&5
+$as_echo_n "checking for library containing tparm... " >&6; }
+if ${ac_cv_search_tparm+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tparm ();
+int
+main ()
+{
+return tparm ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' termcap tinfo curses ncurses; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_tparm=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_tparm+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_tparm+:} false; then :
+
+else
+  ac_cv_search_tparm=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tparm" >&5
+$as_echo "$ac_cv_search_tparm" >&6; }
+ac_res=$ac_cv_search_tparm
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
 
 # Checks for libtool
 # Check whether --enable-shared was given.
diff --git a/configure.ac b/configure.ac
index 25b6c590..c7aac8aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,8 @@ AC_CHECK_HEADERS( \
 
 # Checks for 'tgetent'
 AC_SEARCH_LIBS([tgetent], [termcap tinfo curses ncurses])
+# Checks for 'tparm'
+AC_SEARCH_LIBS([tparm], [termcap tinfo curses ncurses])
 
 # Checks for libtool
 AM_ENABLE_SHARED
diff --git a/doc/Makefile.am b/doc/Makefile.am
index da0eda92..1aded08d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,6 +2,8 @@
 # Makefile.am  -  the Final Cut library
 #----------------------------------------------------------------------
 
+docdir = ${datadir}/doc/${PACKAGE}
+
 EXTRA_DIST = \
 	calendar-draft.png \
 	class-diagram.txt \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2ebc0cb5..ff6cfe50 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -234,7 +234,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = @docdir@
+docdir = ${datadir}/doc/${PACKAGE}
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -317,9 +317,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign doc/Makefile
+	  $(AUTOMAKE) --gnu doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/Makefile.in b/src/Makefile.in
index ad70b961..86cb85c1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -445,9 +445,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/Makefile
+	  $(AUTOMAKE) --gnu src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/fonts/Makefile.in b/src/fonts/Makefile.in
index dcf5cdbc..79fcfcd8 100644
--- a/src/fonts/Makefile.in
+++ b/src/fonts/Makefile.in
@@ -261,9 +261,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/fonts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/fonts/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/fonts/Makefile
+	  $(AUTOMAKE) --gnu src/fonts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/Makefile.in b/test/Makefile.in
index 9ae67ffa..18efd05a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -341,9 +341,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/Makefile
+	  $(AUTOMAKE) --gnu test/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \