diff --git a/ChangeLog b/ChangeLog
index f08f4b3..a2b3de2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 29 22:34:03 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
+
+	* libnotify/notify.c:
+	* tools/notify-send.c:
+	  - Don't flush the D-BUS connection, and make sure we disconnect from it.
+
 Wed Sep 29 21:53:15 PDT 2004  Christian Hammond <chipx86@gnupdate.org>
 
 	* libnotify/notify.c:
diff --git a/libnotify/notify.c b/libnotify/notify.c
index fc7a38c..2c18e3f 100644
--- a/libnotify/notify.c
+++ b/libnotify/notify.c
@@ -312,8 +312,10 @@ _notify_disconnect(void)
 		_filters_added = FALSE;
 	}
 
-	dbus_connection_flush(_dbus_conn);
+	dbus_connection_disconnect(_dbus_conn);
 	dbus_connection_unref(_dbus_conn);
+
+	_dbus_conn = NULL;
 }
 
 gboolean
diff --git a/tools/notify-send.c b/tools/notify-send.c
index 5f6a266..25ba848 100644
--- a/tools/notify-send.c
+++ b/tools/notify-send.c
@@ -122,7 +122,8 @@ main(int argc, const char **argv)
 		}
 	}
 
-	if (!notify_init("notify-send")) exit(1);
+	if (!notify_init("notify-send"))
+		exit(1);
 
 	notify_send_notification(NULL, type, urgency, summary, body, icon,
 							 TRUE, expire_timeout, NULL, 0);