diff --git a/ChangeLog b/ChangeLog
index 9a4411e..b29f7c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4315,3 +4315,14 @@ buttonbars if you enable multibyte support but don't have a specific
 encoding in use.  I also corrected a large number of misplaced
 newlines in error messages; I think that was some Perl-fu gone awry.
 ----------------------------------------------------------------------
+Sun Aug  5 01:52:51 2001                        Michael Jennings (mej)
+
+Okay, first off, I finally found and fixed a typo with regard to the
+utempter support on RedHat-based systems.  I doubt it's ever worked
+properly (sigh).  Secondly, I added support for throwing Eterm's
+termcap entry into the termcap DB on FreeBSD (and possibly other
+*BSD-based) systems thanks to info from Kirby Kuehl
+<vacuum@technotronic.com>.  And finally, added in a patch from Paul
+Brannan <pbranna@clemson.edu> to support some additional escape
+sequences for vim.
+----------------------------------------------------------------------
diff --git a/acconfig.h b/acconfig.h
index 4352e05..4512f12 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -326,7 +326,6 @@
 #undef DEF_FONT_IDX
 #undef MULTICHAR_ENCODING
 #undef IOTRACE
-#undef HAVE_UTEMPTER
 #undef PTY_GRP_NAME
 #undef ENABLE_PROFILE
 #undef KS_HOME
diff --git a/configure.in b/configure.in
index 9c1795a..29700ef 100644
--- a/configure.in
+++ b/configure.in
@@ -845,8 +845,8 @@ AC_CHECK_LIB(Kenny, life_signs, , [
 ])
 fi
 
-CONFIG_SEARCH_PATH=`eval eval eval eval eval echo "${datadir}/$PACKAGE/themes:${datadir}/$PACKAGE"`
-AC_DEFINE_UNQUOTED(CONFIG_SEARCH_PATH, "~/.Eterm/themes:~/.Eterm:$CONFIG_SEARCH_PATH")
+CONFIG_SEARCH_PATH=`eval eval eval eval eval echo "${sysconfdir}/$PACKAGE/themes:/etc/$PACKAGE/themes:${datadir}/$PACKAGE/themes"`
+AC_DEFINE_UNQUOTED(CONFIG_SEARCH_PATH, "~/.Eterm/themes:$CONFIG_SEARCH_PATH")
 # Do replacements on theme files and such.  All variables to be replaced
 # by this routine MUST be exported before the awk script runs.
 if test "X$PKGDATADIR" = "X" ; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8ec62ff..372ed9b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,6 +13,10 @@ Eterm.1.html: Eterm.1
 install-data-hook:
 	$(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC) -o$(HOME)/.terminfo Eterm.ti) || :
 	-infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
+	-if test -f /usr/share/misc/termcap && test -f Eterm.tcap ; then \
+	    grep 'Eterm-color' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \
+	    cap_mkdb -f /usr/share/misc/termcap.db /usr/share/misc/termcap ; \
+	fi || :
 
 EXTRA_DIST = Eterm.1.in Eterm_reference.html Eterm.tcap Eterm.ti Makefile.am Makefile.in
 
diff --git a/src/eterm_utmp.h b/src/eterm_utmp.h
index 184838e..574e90c 100644
--- a/src/eterm_utmp.h
+++ b/src/eterm_utmp.h
@@ -28,7 +28,7 @@
 #include <X11/Intrinsic.h>	/* Xlib, Xutil, Xresource, Xfuncproto */
 
 #ifdef UTMP_SUPPORT
-# ifdef HAVE_UTEMPTER
+# ifdef HAVE_LIBUTEMPTER
 #  include <utempter.h>
 #  define add_utmp_entry(p, h, f)  addToUtmp(p, h, f)
 #  define remove_utmp_entry()      removeFromUtmp()
@@ -83,7 +83,7 @@
 /************ Function Prototypes ************/
 _XFUNCPROTOBEGIN
 
-# ifndef HAVE_UTEMPTER
+# ifndef HAVE_LIBUTEMPTER
 extern void add_utmp_entry(const char *, const char *, int);
 extern void remove_utmp_entry(void);
 # endif
diff --git a/src/term.c b/src/term.c
index 5a49260..ab40146 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1526,6 +1526,20 @@ process_terminal_mode(int mode, int priv, unsigned int nargs, int arg[])
 	    else
 	      Options |= Opt_home_on_input;
 	    break;
+          case 1047:            /* Alternate screen & clear */
+            PrivCases(PrivMode_Screen);
+            scr_change_screen(state);
+            scr_erase_screen(0);
+            break;
+          case 1048:            /* Save/restore cursor pos */
+            PrivCases(PrivMode_Screen);
+            scr_cursor(state ? SAVE : RESTORE);
+            break;
+          case 1049:            /* Alternate screen & cursor */
+            PrivCases(PrivMode_Screen);
+            scr_cursor(state ? SAVE : RESTORE);
+            scr_change_screen(state);
+            break;
 	}
       break;
   }
diff --git a/src/utmp.c b/src/utmp.c
index 73da54c..6d02c4c 100644
--- a/src/utmp.c
+++ b/src/utmp.c
@@ -82,7 +82,7 @@ static const char cvs_ident[] = "$Id$";
 # endif
 
 /* don't go off end of ut_id & remember if an entry has been made */
-# ifndef HAVE_UTEMPTER
+# ifndef HAVE_LIBUTEMPTER
 #  if defined(USE_SYSV_UTMP) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
 static char ut_id[5];		/* remember if entry to utmp made */
 #  else
@@ -98,7 +98,7 @@ static int utmp_pos;		/* BSD position of utmp-stamp */
 #   define update_wtmp updwtmpx
 #  else				/* HAVE_UTMPX_H */
 
-#   ifndef HAVE_UTEMPTER
+#   ifndef HAVE_LIBUTEMPTER
 static void
 update_wtmp(char *fname, struct utmp *putmp)
 {
@@ -134,10 +134,10 @@ update_wtmp(char *fname, struct utmp *putmp)
 
   close(fd);
 }
-#   endif /* ifndef HAVE_UTEMPTER */
+#   endif /* ifndef HAVE_LIBUTEMPTER */
 #  endif /* HAVE_UTMPX_H */
 
-#  ifndef HAVE_UTEMPTER
+#  ifndef HAVE_LIBUTEMPTER
 void
 add_utmp_entry(const char *pty, const char *hostname, int fd)
 {
@@ -266,7 +266,7 @@ remove_utmp_entry(void)
   endutent();
 #   endif /* HAVE_UTMPX_H */
 }
-#  endif /* ifndef HAVE_UTEMPTER */
+#  endif /* ifndef HAVE_LIBUTEMPTER */
 
 # else /* USE_SYSV_UTMP */
 /* BSD utmp support */