diff --git a/GNUmakefile.in b/GNUmakefile.in
index bc34942d57a3da79bfc603920c785c4180bae129..3f2e235a587cc01b8f4212eb28c2e9f36ed21590 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -15,12 +15,12 @@ include Makeconf
 #   assign db lib 
 # Things that may have dependencies go next:
 #   @optional_subdirs@ (has event)
-#   discvr ipod os security sensors 
+#   ipod os security sensors 
 # Then things that only depend on stuff we've done:
 #   pxe tbsetup tmcd utils www tip capture vis
 # Then things that depend on stuff we just did:
 #
-SUBDIRS = lib db assign @optional_subdirs@ discvr ipod security sensors \
+SUBDIRS = lib db assign @optional_subdirs@ ipod security sensors \
 		pxe tbsetup account tmcd utils www tip capture ipod vis \
 		sensors os
 
diff --git a/configure b/configure
index 5720ec02b34f489a974b3e82f66178e276fe9757..510ae11a1de59c30137fb9930602c254ca114b7e 100755
--- a/configure
+++ b/configure
@@ -1366,7 +1366,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	db/sitevarscheck \
 	db/grabron db/webnfree db/stategraph db/readycount \
 	db/idletimes db/idlemail db/webidlemail db/xmlconvert \
-	discvr/GNUmakefile \
 	ipod/GNUmakefile \
 	lib/GNUmakefile lib/libtb/GNUmakefile \
 	os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
diff --git a/configure.in b/configure.in
index 4a39082ee4568a7a5ad43b16ab75bb5fe2a09e9f..e7dfd769407d003c6a48b401a4639e0412997ebb 100755
--- a/configure.in
+++ b/configure.in
@@ -403,7 +403,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	db/sitevarscheck \
 	db/grabron db/webnfree db/stategraph db/readycount \
 	db/idletimes db/idlemail db/webidlemail db/xmlconvert \
-	discvr/GNUmakefile \
 	ipod/GNUmakefile \
 	lib/GNUmakefile lib/libtb/GNUmakefile \
 	os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \