diff --git a/ChangeLog b/ChangeLog
index cae44d793f48b8e54a65f0c4f9998b8e19bdc2f0..20c926bfe4030f3f04c2649622cf4f432c4e7a95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Dec 11 19:10:46 +0100 2008 Jim Meyering <meyering@redhat.com>
+
+	build: avoid libvirtd link failure with CFLAGS=-g
+	* qemud/Makefile.am (libvirtd_LDADD): Add gnulib's libgnu.la last.
+	Otherwise, building with -g (no inlining) would fail due to a use
+	of c_isspace in libvirt_driver_qemu.a, which used to followed
+	libgnu.a in the link command.
+
 Thu Dec 11 16:13:08 +0100 2008 Jim Meyering <meyering@redhat.com>
 
 	syntax-check: prohibit all new uses of gethostby* functions
diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 8cb0847fefa34191b47c612c986f8fcc2c191e2f..b8dae8890fbf513b045b9fed282c39de004d5489 100644
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -93,8 +93,7 @@ libvirtd_LDADD =					\
 	$(LIBXML_LIBS)					\
 	$(GNUTLS_LIBS)					\
 	$(SASL_LIBS)					\
-	$(POLKIT_LIBS)					\
-	../gnulib/lib/libgnu.la
+	$(POLKIT_LIBS)
 
 if ! WITH_DRIVER_MODULES
 if WITH_QEMU
@@ -244,6 +243,10 @@ uninstall-init:
 
 endif # DBUS_INIT_SCRIPTS_RED_HAT
 
+# This must be added last, since functions it provides/replaces
+# are used by nearly every other library.
+libvirtd_LDADD += ../gnulib/lib/libgnu.la
+
 endif # WITH_LIBVIRTD
 
 CLEANFILES = libvirtd.init