diff --git a/bin/Makefile.in b/bin/Makefile.in
index 2fe2a7f932..45155dbebd 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -3,7 +3,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
-SUBDIRS =	tests
+SUBDIRS =	tests server
 TARGETS =
 
 @BIND9_MAKE_RULES@
diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index c7b4347bd8..e4164a4141 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -300,7 +300,7 @@ getsection(isc_buffer_t *source, dns_namelist_t *section, unsigned int count,
 	}
 }
 
-static void
+void
 getmessage(dns_message_t *message, isc_buffer_t *source,
 	   isc_buffer_t *target)
 {
@@ -438,7 +438,7 @@ printsection(dns_namelist_t *section, char *section_name) {
 	return (DNS_R_SUCCESS);
 }
 
-static dns_result_t
+dns_result_t
 printmessage(dns_message_t *message) {
 	isc_boolean_t did_flag = ISC_FALSE;
 	unsigned int opcode, rcode;
@@ -484,6 +484,7 @@ printmessage(dns_message_t *message) {
 	return (result);
 }
 
+#ifndef NOMAIN
 int
 main(int argc, char *argv[]) {
 	char *rp, *wp;
@@ -563,3 +564,4 @@ main(int argc, char *argv[]) {
 
 	return (0);
 }
+#endif /* !NOMAIN */
diff --git a/configure b/configure
index c23a964d66..1357a83d2a 100755
--- a/configure
+++ b/configure
@@ -1635,6 +1635,7 @@ trap 'rm -fr `echo "make/rules
 	lib/dns/include/dns/Makefile
 	bin/Makefile
 	bin/tests/Makefile
+	bin/server/Makefile
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -1742,6 +1743,7 @@ CONFIG_FILES=\${CONFIG_FILES-"make/rules
 	lib/dns/include/dns/Makefile
 	bin/Makefile
 	bin/tests/Makefile
+	bin/server/Makefile
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff --git a/configure.in b/configure.in
index 6aa140f93d..3f8e722fc6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 
-AC_REVISION($Revision: 1.7 $)
+AC_REVISION($Revision: 1.8 $)
 
 AC_INIT(lib/dns/name.c)
 AC_CONFIG_HEADER(config.h)
@@ -78,4 +78,5 @@ AC_OUTPUT(
 	lib/dns/include/dns/Makefile
 	bin/Makefile
 	bin/tests/Makefile
+	bin/server/Makefile
 )