diff --git a/NetworkManager.spec b/NetworkManager.spec
index dd92a2a..5549314 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -16,7 +16,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}%{?dist}
+Release: 0.11.%{snapshot}.1%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,6 +28,7 @@ Patch2: disable-editing-system-connections-for-now.patch
 Patch3: old-dbus-glib.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
+Patch6: wpa-adhoc-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -153,6 +154,7 @@ tar -xzf %{SOURCE1}
 %patch3 -p1 -b .old-dbus-glib
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
+%patch6 -p1 -b .wpa-adhoc-fix
 
 %build
 autoreconf -i
@@ -307,6 +309,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Thu Sep  4 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022.1
+- Fix WPA Ad-Hoc connections
+
 * Wed Aug 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022
 - Fix parsing of DOMAIN in ifcfg files (rh #459370)
 - Fix reconnection to mobile broadband networks after an auth failure
diff --git a/wpa-adhoc-fix.patch b/wpa-adhoc-fix.patch
new file mode 100644
index 0000000..47921d7
--- /dev/null
+++ b/wpa-adhoc-fix.patch
@@ -0,0 +1,12 @@
+diff -up NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c
+--- NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo	2008-09-04 13:33:24.000000000 -0400
++++ NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c	2008-09-04 13:33:32.000000000 -0400
+@@ -66,7 +66,7 @@ static const struct validate_entry valid
+ const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL };
+ const char * group_allowed[] =    { "CCMP", "TKIP", "WEP104", "WEP40", NULL };
+ const char * proto_allowed[] =    { "WPA", "RSN", NULL };
+-const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
++const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",
+                                     "NONE", NULL };
+ const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
+ const char * eap_allowed[] =      { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",