diff --git a/ChangeLog b/ChangeLog
index 967e5c9851..d0fbd62320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 17 11:32:01 +0100 2009 Jim Meyering <meyering@redhat.com>
+
+	Avoid link failure when configured --with-driver-modules
+	* qemud/Makefile.am (WITH_DRIVER_MODULES): Link with libvirt_driver.la
+	and libvirt_util.la.  Indent for readability.
+
 Tue Feb 17 11:30:23 +0100 2009 Maximilian Wilhelm <max@rfc2324.org>
 
 	Work around 'virGetVersion' build problem
diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index a0c161a00d..498f05cb77 100644
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -104,30 +104,33 @@ libvirtd_LDADD =					\
 	$(SASL_LIBS)					\
 	$(POLKIT_LIBS)
 
-if ! WITH_DRIVER_MODULES
-if WITH_QEMU
-libvirtd_LDADD += ../src/libvirt_driver_qemu.la
-endif
+if WITH_DRIVER_MODULES
+  libvirtd_LDADD += ../src/libvirt_driver.la
+  libvirtd_LDADD += ../src/libvirt_util.la
+else
+  if WITH_QEMU
+    libvirtd_LDADD += ../src/libvirt_driver_qemu.la
+  endif
 
-if WITH_LXC
-libvirtd_LDADD += ../src/libvirt_driver_lxc.la
-endif
+  if WITH_LXC
+    libvirtd_LDADD += ../src/libvirt_driver_lxc.la
+  endif
 
-if WITH_UML
-libvirtd_LDADD += ../src/libvirt_driver_uml.la
-endif
+  if WITH_UML
+    libvirtd_LDADD += ../src/libvirt_driver_uml.la
+  endif
 
-if WITH_STORAGE_DIR
-libvirtd_LDADD += ../src/libvirt_driver_storage.la
-endif
+  if WITH_STORAGE_DIR
+    libvirtd_LDADD += ../src/libvirt_driver_storage.la
+  endif
 
-if WITH_NETWORK
-libvirtd_LDADD += ../src/libvirt_driver_network.la
-endif
+  if WITH_NETWORK
+    libvirtd_LDADD += ../src/libvirt_driver_network.la
+  endif
 
-if WITH_NODE_DEVICES
-libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
-endif
+  if WITH_NODE_DEVICES
+    libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
+  endif
 endif
 
 libvirtd_LDADD += ../src/libvirt.la