diff --git a/Makefile.am b/Makefile.am
index 8e3d86f..925dcbc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,43 +158,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav                       \
 
 ${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
 	@rm -f "$@"
-	sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$<" >"$@"
+	sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
 
 ${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
 	@src="${top_srcdir}/shellinabox/shellinaboxd.man.in";                 \
diff --git a/Makefile.in b/Makefile.in
index fdfe133..f86e8eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1172,43 +1172,43 @@ ${top_srcdir}/demo/demo.js: ${top_srcdir}/demo/beep.wav                       \
 
 ${top_srcdir}/demo/beep.wav: ${top_srcdir}/shellinabox/beep.wav
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/enabled.gif: ${top_srcdir}/shellinabox/enabled.gif
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/favicon.ico: ${top_srcdir}/shellinabox/favicon.ico
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/styles.css: ${top_srcdir}/shellinabox/styles.css
 	@rm -f "$@"
-	sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$<" >"$@"
+	sed -e '/\[if DEFINES_COLORS\]/,/\[endif DEFINES_COLORS\]/d' "$^" >"$@"
 
 ${top_srcdir}/demo/print-styles.css: ${top_srcdir}/shellinabox/print-styles.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-0.css: ${top_srcdir}/shellinabox/white-on-black.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-1.css: ${top_srcdir}/shellinabox/black-on-white.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-2.css: ${top_srcdir}/shellinabox/monochrome.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/usercss-3.css: ${top_srcdir}/shellinabox/color.css
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 ${top_srcdir}/demo/vt100.js: ${top_srcdir}/shellinabox/vt100.js
 	@rm -f "$@"
-	ln "$<" "$@"
+	ln "$^" "$@"
 
 shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
 	@src="${top_srcdir}/shellinabox/shellinaboxd.man.in";                 \
diff --git a/config.h b/config.h
index df0cfbb..31c1dcc 100644
--- a/config.h
+++ b/config.h
@@ -153,7 +153,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "207"
+#define VCS_REVISION "208"
 
 /* Version number of package */
 #define VERSION "2.10"
diff --git a/configure b/configure
index 75ae8f9..47f3cab 100755
--- a/configure
+++ b/configure
@@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=207
+VCS_REVISION=208
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 77c23c3..511cc32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
-VCS_REVISION=207
+VCS_REVISION=208
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])
diff --git a/demo/vt100.js b/demo/vt100.js
index 2a382ac..0e83bb6 100644
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 207)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 208)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };
diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c
index 4ff1c5a..a4c8613 100644
--- a/shellinabox/launcher.c
+++ b/shellinabox/launcher.c
@@ -503,7 +503,6 @@ static void updwtmpx(const char *wtmpx_file, const struct utmpx *utx) {
   struct utmp ut   = { 0 };
   ut.ut_type       = utx->ut_type;
   ut.ut_pid        = utx->ut_pid;
-  ut.ut_session    = utx->ut_session;
   ut.ut_tv.tv_sec  = utx->ut_tv.tv_sec;
   ut.ut_tv.tv_usec = utx->ut_tv.tv_usec;
   memcpy(&ut.ut_line, &utx->ut_line,
@@ -514,10 +513,6 @@ static void updwtmpx(const char *wtmpx_file, const struct utmpx *utx) {
          min(sizeof(ut.ut_user), sizeof(utx->ut_user)));
   memcpy(&ut.ut_host, &utx->ut_host,
          min(sizeof(ut.ut_host), sizeof(utx->ut_host)));
-  memcpy(&ut.ut_exit, &utx->ut_exit,
-         min(sizeof(ut.ut_exit), sizeof(utx->ut_exit)));
-  memcpy(&ut.ut_addr_v6, &utx->ut_addr_v6,
-         min(sizeof(ut.ut_addr_v6), sizeof(utx->ut_addr_v6)));
   updwtmp(wtmpx_file, &ut);
 }
 #endif
diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 4cc7b5d..ddf5c63 100644
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.10 (revision 207)" +
+  alert("Shell In A Box version " + "2.10 (revision 208)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 2a382ac..0e83bb6 100644
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 207)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 208)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };