diff --git a/ChangeLog b/ChangeLog
index 9a72b53ce4055e5c66c41c0522fd8f698b8c79bd..34c538ded587663e8f91b55ce5d0f8847c3c9065 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-18  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* src/nautilus-main.c: (main):
+	* src/nautilus-window-slot.c: (nautilus_window_slot_dispose):
+	Plug two memory leaks.
+
 2008-11-11  A. Walton  <awalton@gnome.org>
 
 	* src/file-manager/fm-directory-view.c
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 6b71389bb0be94547775a0c6d7cc4cd935bba771..1a873bbe6a2be5ee9cae3167382901672d994a29 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -389,6 +389,8 @@ main (int argc, char *argv[])
 		return 1;
 	}
 
+	g_option_context_free (context);
+
 	if (version) {
 		g_print ("GNOME nautilus " PACKAGE_VERSION "\n");
 		return 0;
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index f8f6c663ed5fc83628a41e9587f6c42484b17d64..253872aa806ff981f1b3d6a47af9a9688ef7c57d 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -617,6 +617,9 @@ nautilus_window_slot_dispose (GObject *object)
 	g_free (slot->title);
 	slot->title = NULL;
 
+	g_free (slot->status_text);
+	slot->status_text = NULL;
+
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }