diff --git a/ChangeLog b/ChangeLog
index 9c34231f1d..b0aa9d566e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 15 16:00:05 IST 2007 Mark McLoughlin <markmc@redhat.com>
+
+	* qemud/bridge.c: don't output bridge parameters if they
+	are the default.
+	
 Thu Feb 15 15:56:32 IST 2007 Mark McLoughlin <markmc@redhat.com>
 
 	* qemud/conf.[ch], qemud/dispatch.c, qemud/internal.h,
diff --git a/qemud/conf.c b/qemud/conf.c
index 8838e43309..0bc3654c9d 100644
--- a/qemud/conf.c
+++ b/qemud/conf.c
@@ -1957,7 +1957,8 @@ char *qemudGenerateNetworkXML(struct qemud_server *server,
                           uuid[12], uuid[13], uuid[14], uuid[15]) < 0)
         goto no_memory;
 
-    if (qemudBufferPrintf(&buf, "  <bridge name='%s' stp='%s' delay='%d' />\n",
+    if ((def->bridge != '\0' || def->disableSTP || def->forwardDelay) &&
+        qemudBufferPrintf(&buf, "  <bridge name='%s' stp='%s' delay='%d' />\n",
                           def->bridge,
                           def->disableSTP ? "off" : "on",
                           def->forwardDelay) < 0)