diff --git a/ChangeLog b/ChangeLog
index 2395590af4..8bba459a94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun  3 15:44:55 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/network_driver.c: forbid set Autostart on transcient networks
+
 Wed Jun  3 14:30:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/vbox/vbox_tmpl.c: Switch to positional struct initializers
diff --git a/src/network_driver.c b/src/network_driver.c
index 10d5fd3d65..0c1623cbc5 100644
--- a/src/network_driver.c
+++ b/src/network_driver.c
@@ -1353,6 +1353,12 @@ static int networkSetAutostart(virNetworkPtr net,
         goto cleanup;
     }
 
+    if (!network->persistent) {
+        networkReportError(net->conn, NULL, net, VIR_ERR_INTERNAL_ERROR,
+                         "%s", _("cannot set autostart for transient network"));
+        goto cleanup;
+    }
+
     autostart = (autostart != 0);
 
     if (network->autostart != autostart) {