diff --git a/CHANGES b/CHANGES
index 7cfd2d4762..c951b551dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
-3216.   [bug]           resolver.c:validated() was not thread-safe. [RT #26478]
+3217.	[cleanup]	Fix build problem with --disable-static. [RT #26476]
+
+3216.	[bug]		resolver.c:validated() was not thread-safe. [RT #26478]
 
 3215.	[bug]		'rndc recursing' could cause a core dump. [RT #26495]
 
diff --git a/bin/tests/system/dlzexternal/Makefile.in b/bin/tests/system/dlzexternal/Makefile.in
index 5ac5c11cb1..9e01993bab 100644
--- a/bin/tests/system/dlzexternal/Makefile.in
+++ b/bin/tests/system/dlzexternal/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2011/03/11 07:11:07 each Exp $
+# $Id: Makefile.in,v 1.4 2011/11/16 00:42:07 each Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -49,7 +49,7 @@ dlopen@EXEEXT@: ${DLOPENOBJS}
 		-o $@ ${DLOPENOBJS} ${LIBS}
 
 driver.@SO@: ${SO_OBJS}
-	@SO_LD@ -o $@ driver.o
+	${LIBTOOL_MODE_LINK} @SO_LD@ -o $@ driver.@O@
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/configure.in b/configure.in
index 362db4a049..12a3b88a68 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.530 $)
+AC_REVISION($Revision: 1.531 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -1437,9 +1437,9 @@ case $use_libtool in
 		O=lo
 		A=la
 		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
-		LIBTOOL_MODE_COMPILE='--mode=compile'
-		LIBTOOL_MODE_INSTALL='--mode=install'
-		LIBTOOL_MODE_LINK='--mode=link'
+		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
+		LIBTOOL_MODE_INSTALL='--mode=install --tag=CC'
+		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
 		case "$host" in
 		*) LIBTOOL_ALLOW_UNDEFINED= ;;
 		esac