diff --git a/bin/Makefile.in b/bin/Makefile.in
index 23b6b7884b..38f2437f0a 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -17,7 +17,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
-SUBDIRS =	named tests
+SUBDIRS =	named lwresd tests
 TARGETS =
 
 @BIND9_MAKE_RULES@
diff --git a/configure b/configure
index b20305106e..7e62d3baab 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.73 
+# From configure.in Revision: 1.74 
 
 
 
@@ -3415,6 +3415,7 @@ trap 'rm -fr `echo "make/rules
 	bin/Makefile
 	bin/named/Makefile
 	bin/named/unix/Makefile
+	bin/lwresd/Makefile
 	bin/tests/Makefile
 	bin/tests/names/Makefile
 	bin/tests/master/Makefile
@@ -3607,6 +3608,7 @@ CONFIG_FILES=\${CONFIG_FILES-"make/rules
 	bin/Makefile
 	bin/named/Makefile
 	bin/named/unix/Makefile
+	bin/lwresd/Makefile
 	bin/tests/Makefile
 	bin/tests/names/Makefile
 	bin/tests/master/Makefile
diff --git a/configure.in b/configure.in
index d9ea23c2f0..2d463e6ab1 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ dnl PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 dnl ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 dnl SOFTWARE.
 
-AC_REVISION($Revision: 1.74 $)
+AC_REVISION($Revision: 1.75 $)
 
 AC_PREREQ(2.13)
 
@@ -586,6 +586,7 @@ AC_OUTPUT(
 	bin/Makefile
 	bin/named/Makefile
 	bin/named/unix/Makefile
+	bin/lwresd/Makefile
 	bin/tests/Makefile
 	bin/tests/names/Makefile
 	bin/tests/master/Makefile
diff --git a/lib/lwres/context.c b/lib/lwres/context.c
index 6550dba759..65ecbaebf8 100644
--- a/lib/lwres/context.c
+++ b/lib/lwres/context.c
@@ -39,10 +39,6 @@ static void *lwres_malloc(void *, size_t);
 static void lwres_free(void *, void *, size_t);
 static int context_connect(lwres_context_t *);
 
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK 0x7f000001UL
-#endif
-
 int
 lwres_context_create(lwres_context_t **contextp, void *arg,
 		     lwres_malloc_t malloc_function,
diff --git a/lib/lwres/include/lwres/lwbuffer.h b/lib/lwres/include/lwres/lwbuffer.h
index f53e7f4af2..b4a9050829 100644
--- a/lib/lwres/include/lwres/lwbuffer.h
+++ b/lib/lwres/include/lwres/lwbuffer.h
@@ -142,7 +142,7 @@ ISC_LANG_BEGINDECLS
 typedef struct lwres_buffer lwres_buffer_t;
 struct lwres_buffer {
 	unsigned int		magic;
-	void		       *base;
+	unsigned char 	       *base;
 	/* The following integers are byte offsets from 'base'. */
 	unsigned int		length;
 	unsigned int		used;
diff --git a/lib/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h
index d3e54384e1..9101871b6c 100644
--- a/lib/lwres/include/lwres/lwres.h
+++ b/lib/lwres/include/lwres/lwres.h
@@ -89,6 +89,13 @@
 #define LWRES_UDP_PORT		921	/* XXXMLG */
 #define LWRES_RECVLENGTH	2048	/* XXXMLG */
 
+/*
+ * XXXMLG
+ */
+#ifndef INADDR_LOOPBACK
+#define INADDR_LOOPBACK 0x7f000001UL
+#endif
+
 /*
  * NO-OP
  */