diff --git a/ChangeLog b/ChangeLog
index 65fcaf7f6..b82ac3c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-08  Dan Williams  <dcbw@redhat.com>
+
+	We now require a patch for wpa_supplicant to support Ad-Hoc
+	networks:
+	  http://people.redhat.com/dcbw/wpa_supplicant-ctrl-iface-ap-scan.patch
+
+	* src/nm-device-802-11-wireless.c
+		- (supplicant_send_network_config): turn off wpa_supplicant's
+			scanning.  Fixes Ad-Hoc networks.
+
 2006-01-08  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-ap-security.c
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index a720794be..409aba0a2 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2432,6 +2432,11 @@ supplicant_send_network_config (NMDevice80211Wireless *self,
 	ctrl = self->priv->sup_ctrl;
 	g_assert (ctrl);
 
+	/* Tell wpa_supplicant that we'll do the scanning */
+	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
+			"AP_SCAN 2"))
+		goto out;
+
 	/* Standard network setup info */
 	if (!(response = nm_utils_supplicant_request (ctrl, "ADD_NETWORK")))
 	{