diff --git a/configure b/configure
index de30db4f..69f606eb 100755
--- a/configure
+++ b/configure
@@ -62,48 +62,11 @@ if [ "$sysname" = "" ]; then
   exit 1;
 fi
 
-if [ \( $sysname = "bsdos" -o $sysname = "netbsd" -o $sysname = "freebsd" \) \
-	-a \( ! -f /var/db/dhcpd.leases \) -a \( -f /etc/dhcpd.leases \) ];
-  then
-    echo
-    echo "                   !!!WARNING!!!"
-    echo
-    echo DHCPD is now storing the DHCP lease database in /var/db
-    echo instead of /etc.   Before you start using this new version
-    echo of dhcpd, you must move your dhcpd.leases file from /etc
-    echo to /var/db!
-    echo
-    echo "                   !!!WARNING!!!"
-    echo
-fi
-
-if [ \( $sysname = "linux" \) \
-	-a \( ! -f /var/dhcpd/dhcpd.leases \) -a \( -f /etc/dhcpd.leases \) ];
-  then
-    echo
-    echo "                   !!!WARNING!!!"
-    echo
-    echo DHCPD is now storing the DHCP lease database in /var/dhcpd
-    echo instead of /etc.   Before you start using this new version
-    echo of dhcpd, you must move your dhcpd.leases file from /etc
-    echo to /var/dhcpd!
-    echo
-    echo "                   !!!WARNING!!!"
-    echo
-fi
-
-echo
-echo "                          !!!WARNING!!!"
-echo
-echo " The lease database format changed as of Beta 5.   Please read the"
-echo " RELNOTES file for details!"
-echo
-echo "                          !!!WARNING!!!"
-
-
 echo "System Type: $sysname"
 
-sed -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \
-		<Makefile.dist >Makefile
+for foo in . client server common; do
+	(cd $foo; sed -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \
+		<Makefile.dist >Makefile)
+done
 
 exit 0