diff --git a/ChangeLog b/ChangeLog
index 1ad408a71..954aa12ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-31  Dan Williams <dcbw@redhat.com>
+
+	* src/NetworkManagerDevice.c
+		- (nm_device_wireless_scan): Fix leak of scan results in some
+			instances
+
 2005-03-29  Dan Williams <dcbw@redhat.com>
 
 	* src/NetworkManager.c
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index f2b114793..61ecdb76c 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3766,6 +3766,12 @@ static gboolean nm_device_wireless_scan (gpointer user_data)
 			}
 
 			close (sk);
+
+			if (!scan_results->scan_head.result)
+			{
+				g_free (scan_results);
+				scan_results = NULL;
+			}
 		}
 		nm_unlock_mutex (dev->options.wireless.scan_mutex, __FUNCTION__);
 	}