diff --git a/ChangeLog b/ChangeLog
index 409937e69c..e46ca99374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 26 16:05:04 CET 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/remote_internal.c: fix autostart of session daemon, patch
+	  by Dan Berrange
+
 Thu Feb 26 15:35:40 CET 2009 Daniel Veillard <veillard@redhat.com>
 
 	* src/storage_backend_fs.c: fix compile-error when configured without
diff --git a/src/remote_internal.c b/src/remote_internal.c
index eda6177808..0439905fd6 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -651,12 +651,13 @@ doRemoteOpen (virConnectPtr conn,
              */
             if (errno == ECONNREFUSED &&
                 flags & VIR_DRV_OPEN_REMOTE_AUTOSTART &&
-                trials < 5) {
+                trials < 20) {
                 close(priv->sock);
                 priv->sock = -1;
-                if (remoteForkDaemon(conn) == 0) {
+                if (trials > 0 ||
+                    remoteForkDaemon(conn) == 0) {
                     trials++;
-                    usleep(5000 * trials * trials);
+                    usleep(1000 * 100 * trials);
                     goto autostart_retry;
                 }
             }