diff --git a/ChangeLog b/ChangeLog
index 51be380e21..45d7cfa8c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug  1 13:54:00 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/qemu_driver.c: Always set forward-delay even if zero because
+	the kernel defaults to 15 seconds which is too long
+
 Fri Aug  1 13:19:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
 	Const-correctness fixes in virsh.c
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index ddb3f69698..7fe3903b46 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1480,8 +1480,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn,
     }
 
 
-    if (network->def->delay &&
-        (err = brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay))) {
+    if ((err = brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay))) {
         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
                          _("failed to set bridge forward delay to %ld"),
                          network->def->delay);