diff --git a/config.h.in b/config.h.in
index ef1cb14e7ee785a864611ea2a0d244dc395917e4..7a4d4c8f2dba89b30c60488e64a5f95fcccd7589 100644
--- a/config.h.in
+++ b/config.h.in
@@ -18,6 +18,7 @@
 #undef FSDIR_USERS
 #undef FSDIR_SHARE
 #undef SFSSUPPORT
+#undef ELABINELAB
 #undef LOG_TESTBED
 #undef EVENTSERVER
 #undef BOSSEVENTPORT
diff --git a/configure b/configure
index 444b2653e6eb8d982146d5fd7d5364d823eefa4c..3b44866ff003c14a0307b4147d1f7ad45ff2865d 100755
--- a/configure
+++ b/configure
@@ -891,6 +891,7 @@ fi
 
 
 
+
 
 
 #
@@ -932,6 +933,7 @@ JAILIPBASE=172.17.0.0
 JAILIPMASK=255.240.0.0
 IPBASE=10
 SFSSUPPORT=1
+ELABINELAB=0
 PLABSUPPORT=0
 PLAB_ROOTBALL="change.me"
 PLAB_SLICEPREFIX="utah_elab"
@@ -1393,7 +1395,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:1397: checking for a BSD compatible install" >&5
+echo "configure:1399: 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
@@ -1543,7 +1545,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	tmcd/linux9/GNUmakefile tmcd/linux9/supfile \
 	tmcd/freebsd5/GNUmakefile tmcd/freebsd5/supfile \
 	tmcd/openbsd/GNUmakefile tmcd/ron/GNUmakefile tmcd/plab/GNUmakefile \
-        tmcd/cygwinxp/GNUmakefile \
 	utils/GNUmakefile utils/vlandiff utils/vlansync utils/delay_config \
 	utils/sshtb utils/create_image utils/node_admin utils/webcreateimage \
 	utils/firstuser utils/export_tables utils/eventping \
@@ -1770,6 +1771,7 @@ s%@TBAUTHDOMAIN@%$TBAUTHDOMAIN%g
 s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g
 s%@TBMAINSITE@%$TBMAINSITE%g
 s%@SFSSUPPORT@%$SFSSUPPORT%g
+s%@ELABINELAB@%$ELABINELAB%g
 s%@PLABSUPPORT@%$PLABSUPPORT%g
 s%@TBLOGFACIL@%$TBLOGFACIL%g
 s%@PLAB_ROOTBALL@%$PLAB_ROOTBALL%g
diff --git a/configure.in b/configure.in
index 5f96e41123b0d857ed7db5e075034a77a3a91f5f..b385de6b657ca8056f6981c373049053c18ce105 100755
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,7 @@ AC_SUBST(TBAUTHDOMAIN)
 AC_SUBST(TBAUTHTIMEOUT)
 AC_SUBST(TBMAINSITE)
 AC_SUBST(SFSSUPPORT)
+AC_SUBST(ELABINELAB)
 AC_SUBST(PLABSUPPORT)
 AC_SUBST(TBLOGFACIL)
 AC_SUBST(PLAB_ROOTBALL)
@@ -124,6 +125,7 @@ JAILIPBASE=172.17.0.0
 JAILIPMASK=255.240.0.0
 IPBASE=10
 SFSSUPPORT=1
+ELABINELAB=0
 PLABSUPPORT=0
 PLAB_ROOTBALL="change.me"
 PLAB_SLICEPREFIX="utah_elab"
diff --git a/defs-elabinelab b/defs-elabinelab
index ff207eab9f6fe299f1b5ec6a0ffda437eafb1e8e..97d83ecae25c90c5f30632c1257d98d61631dcf4 100644
--- a/defs-elabinelab
+++ b/defs-elabinelab
@@ -33,6 +33,8 @@ THISHOMEBASE=changeme
 PLABSUPPORT=0
 SFSSUPPORT=0
 DISABLE_NSE=1
+# This means it is an inner elab!
+ELABINELAB=1
 #
 # Network config stuff. Used to generate initial named and dhcpd config files.
 #