diff --git a/configure b/configure
index 8980aea7b2c15008b1561574ceec8a735fad29b9..de1e45f82f468ec0e75acaf46fd01127497451bb 100755
--- a/configure
+++ b/configure
@@ -1451,6 +1451,7 @@ done
 
 
 
+
 
 
 #
@@ -2127,17 +2128,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2130: checking for $ac_hdr" >&5
+echo "configure:2132: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2135 "configure"
+#line 2137 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2176,17 +2177,17 @@ for ac_hdr in linux/videodev.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2179: checking for $ac_hdr" >&5
+echo "configure:2181: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2184 "configure"
+#line 2186 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2219,7 +2220,7 @@ done
 # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2222: checking for $ac_word" >&5
+echo "configure:2224: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2298,7 +2299,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2301: checking for a BSD compatible install" >&5
+echo "configure:2303: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2359,7 +2360,7 @@ esac
 # Extract the first word of "rsync", so it can be a program name with args.
 set dummy rsync; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2362: checking for $ac_word" >&5
+echo "configure:2364: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2469,7 +2470,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	tbsetup/db2ns \
 	tbsetup/tbprerun tbsetup/tbswap tbsetup/tbend tbsetup/tbrestart \
 	tbsetup/tbreport tbsetup/named_setup tbsetup/exports_setup \
-	tbsetup/smbpasswd_setup.proxy \
 	tbsetup/checkpass/GNUmakefile tbsetup/assign_wrapper tbsetup/ptopgen \
 	tbsetup/assign_wrapper2 \
 	tbsetup/frisbeelauncher tbsetup/node_update \
@@ -2481,6 +2481,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	tbsetup/mkproj tbsetup/libtestbed.pm \
 	tbsetup/portstats tbsetup/vnode_setup tbsetup/staticroutes \
 	tbsetup/console_setup.proxy tbsetup/exports_setup.proxy \
+	tbsetup/smbpasswd_setup.proxy \
 	tbsetup/checkports tbsetup/libaudit.pm \
 	tbsetup/libreboot.pm tbsetup/libosload.pm tbsetup/libadminmfs.pm \
 	tbsetup/sfskey_update tbsetup/sfskey_update.proxy \
@@ -2536,6 +2537,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
         utils/backupswitches utils/setbuildinfo utils/checkquota \
 	utils/spewconlog utils/xlogin \
 	utils/opsdb_control utils/opsdb_control.proxy \
+	utils/remove_old_www \
 	www/GNUmakefile www/defs.php3 www/dbdefs.php3 www/xmlrpc.php3 \
 	www/xmlrpcpipe.php3 \
 	www/swish.conf www/websearch \
@@ -2867,8 +2869,8 @@ s%@DELAYTHRESH@%$DELAYTHRESH%g
 s%@PELABSUPPORT@%$PELABSUPPORT%g
 s%@ELVIN_COMPAT@%$ELVIN_COMPAT%g
 s%@ISOLATEADMINS@%$ISOLATEADMINS%g
-s%@REMOTEWIKIDOCS@%$REMOTEWIKIDOCS%g
 s%@DYNAMICROOTPASSWORDS@%$DYNAMICROOTPASSWORDS%g
+s%@REMOTEWIKIDOCS@%$REMOTEWIKIDOCS%g
 s%@TBOPSEMAIL@%$TBOPSEMAIL%g
 s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g
 s%@TBROBOCOPSEMAIL@%$TBROBOCOPSEMAIL%g
diff --git a/configure.in b/configure.in
index f69793ce21308dce3cb57fd76176ab9cd71162b3..61117568da2d858d9d3427a324ee16ab7618d0d1 100755
--- a/configure.in
+++ b/configure.in
@@ -909,6 +909,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
         utils/backupswitches utils/setbuildinfo utils/checkquota \
 	utils/spewconlog utils/xlogin \
 	utils/opsdb_control utils/opsdb_control.proxy \
+	utils/remove_old_www \
 	www/GNUmakefile www/defs.php3 www/dbdefs.php3 www/xmlrpc.php3 \
 	www/xmlrpcpipe.php3 \
 	www/swish.conf www/websearch \
diff --git a/doc/UPDATING b/doc/UPDATING
index e6b0bad879aca07d97683a9bb0d46fe4805d8a8c..db6e8299fdce80e61ea11195d2b550abc13bb99f 100644
--- a/doc/UPDATING
+++ b/doc/UPDATING
@@ -18,6 +18,17 @@ Note that some instructions may have steps that need to occur at a few
 different points in the install process - these are marked with the
 earliest time one of the steps needs to occur.
 
+20080805: Optional, After install.
+
+          As a result of moving the documentation to the WIKI there
+          are many left over files that the normal install process
+          doesn't remove.  To get ride of them run the script:
+
+            sudo sh utils/remove_old_www
+
+          in the obj directory.  All this file is, is a series of rm
+          commands.
+
 20080506: After install.
 
 	  A bug introduced on 2007/10/19 caused the "ezid" flag to not
diff --git a/utils/remove_old_www.in b/utils/remove_old_www.in
new file mode 100755
index 0000000000000000000000000000000000000000..cf983ecfd683e7de13a8f8b9ec9bd2f39645b1af
--- /dev/null
+++ b/utils/remove_old_www.in
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+rm -f @prefix@/www/auth.html
+rm -f @prefix@/www/doc/emotes.html
+rm -f @prefix@/www/doc/exclasses.html
+rm -f @prefix@/www/doc/exp-intro.html
+rm -f @prefix@/www/doc/exp-swapping.html
+rm -f @prefix@/www/doc/hw-recommend.html
+rm -f @prefix@/www/doc/jail.html
+rm -f @prefix@/www/doc/linkdelays.html
+rm -f @prefix@/www/doc/linktest.html
+rm -f @prefix@/www/doc/netbuilddoc.html
+rm -f @prefix@/www/doc/pc2000.html
+rm -f @prefix@/www/doc/pc3000.html
+rm -f @prefix@/www/doc/plab.html
+rm -f @prefix@/www/doc/windows.html
+rm -f @prefix@/www/groups.html
+rm -f @prefix@/www/hardware-emulab.net.html
+rm -f @prefix@/www/hardware.html
+rm -f @prefix@/www/otheremulabs.html
+rm -f @prefix@/www/policies.html
+rm -f @prefix@/www/rdp-mime.html
+rm -f @prefix@/www/security.html
+rm -f @prefix@/www/software.html
+rm -f @prefix@/www/ssh-mime.html
+rm -f @prefix@/www/swapping.html
+rm -f @prefix@/www/tutorial/abcd.png
+rm -f @prefix@/www/tutorial/advanced.html
+rm -f @prefix@/www/tutorial/behindthescenes.html
+rm -f @prefix@/www/tutorial/control-net.png
+rm -f @prefix@/www/tutorial/dumbell.png
+rm -f @prefix@/www/tutorial/elabinelab-pic1.png
+rm -f @prefix@/www/tutorial/elabinelab.php3
+rm -f @prefix@/www/tutorial/eventsystem.html
+rm -f @prefix@/www/tutorial/firewall-experiment.png
+rm -f @prefix@/www/tutorial/firewall.html
+rm -f @prefix@/www/tutorial/gnuradio.html
+rm -f @prefix@/www/tutorial/ixp.html
+rm -f @prefix@/www/tutorial/netfpga.html
+rm -f @prefix@/www/tutorial/nscommands.html
+rm -f @prefix@/www/tutorial/nse.html
+rm -f @prefix@/www/tutorial/pc600wifi_back.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_back_detail.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_back_detail_thumb.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_back_marked.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_back_marked_thumb.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_back_thumb.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_front_left.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_front_left_thumb.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_front_right.jpg
+rm -f @prefix@/www/tutorial/pc600wifi_front_right_thumb.jpg
+rm -f @prefix@/www/tutorial/routing.html
+rm -f @prefix@/www/tutorial/routing.png
+rm -f @prefix@/www/tutorial/secure.html
+rm -f @prefix@/www/tutorial/shark_howto.html
+rm -f @prefix@/www/tutorial/simple.jpg
+rm -f @prefix@/www/tutorial/tutorial.html
+rm -f @prefix@/www/tutorial/tutorial.php3
+rm -f @prefix@/www/tutorial/vnodes-list.png
+rm -f @prefix@/www/tutorial/vnodes.html
+rm -f @prefix@/www/tutorial/widearea.html
+rm -f @prefix@/www/tutorial/wireless.html
+rm -f @prefix@/www/widearea.html