diff --git a/configure b/configure
index 8242e55e06ab888a469f512015ce9ac53480d400..97df56bf576c8c26148367b7638dbc2b7489bafa 100755
--- a/configure
+++ b/configure
@@ -1478,7 +1478,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	security/GNUmakefile security/lastlog_daemon \
         sensors/GNUmakefile sensors/slothd/GNUmakefile \
 	sensors/slothd/sdisrunning sensors/slothd/sddeploy \
-        sensors/canaryd/GNUmakefile \
+        sensors/canaryd/GNUmakefile sensors/and/GNUmakefile \
+	sensors/and/and-emulab.conf \
 	account/GNUmakefile account/tbacct account/webtbacct \
 	account/addpubkey account/webaddpubkey \
 	account/addsfskey account/webaddsfskey \
diff --git a/configure.in b/configure.in
index 6b0a0fcaced9b9b40878525e892f9360fe8b0bd4..a80522d0417943bae783567c9f02e6a018fb13c6 100755
--- a/configure.in
+++ b/configure.in
@@ -517,7 +517,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	security/GNUmakefile security/lastlog_daemon \
         sensors/GNUmakefile sensors/slothd/GNUmakefile \
 	sensors/slothd/sdisrunning sensors/slothd/sddeploy \
-        sensors/canaryd/GNUmakefile \
+        sensors/canaryd/GNUmakefile sensors/and/GNUmakefile \
+	sensors/and/and-emulab.conf \
 	account/GNUmakefile account/tbacct account/webtbacct \
 	account/addpubkey account/webaddpubkey \
 	account/addsfskey account/webaddsfskey \
diff --git a/sensors/GNUmakefile.in b/sensors/GNUmakefile.in
index ed68c57e140a1154249e396a98dc48f7ca0ccc5a..4eb0be9162fcefd5786325747c2628fd7f3af3e0 100644
--- a/sensors/GNUmakefile.in
+++ b/sensors/GNUmakefile.in
@@ -8,7 +8,7 @@ SUBDIR		= sensors
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS	= slothd
+SUBDIRS	= slothd and
 
 SYSTEM            := $(shell uname -s)
 
@@ -58,6 +58,13 @@ $(TARGETS):
 .PHONY: $(SUBDIRS)
 $(SUBDIRS): %: %.all
 
+#
+# Rules to regen configure written files.
+#
+%: %.in
+	@echo "Regenerating $@"
+	cd $(OBJDIR) && CONFIG_FILES=$(SUBDIR)/$@ ./config.status
+
 ###############################################################################
 
 ## Any extra actions can be defined here, e.g.: