diff --git a/gnome-control-center-network-allocate-nm-connection.patch b/gnome-control-center-network-allocate-nm-connection.patch
new file mode 100644
index 0000000..f656587
--- /dev/null
+++ b/gnome-control-center-network-allocate-nm-connection.patch
@@ -0,0 +1,25 @@
+From fafc200c9017d152da2ce59c34130456133a2de6 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <chingpang@gmail.com>
+Date: Thu, 6 Oct 2011 12:16:59 +0800
+Subject: [PATCH] network: allocate nm-connection for nma-wireless-dialog
+
+---
+ panels/network/network-dialogs.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
+index d446dbd..196c6ef 100644
+--- a/panels/network/network-dialogs.c
++++ b/panels/network/network-dialogs.c
+@@ -281,6 +281,8 @@ cc_network_panel_connect_to_8021x_network (CcNetworkPanel   *panel,
+                 return;
+         }
+ 
++        connection = nm_connection_new ();
++
+         /* Need a UUID for the "always ask" stuff in the Dialog of Doom */
+         s_con = (NMSettingConnection *) nm_setting_connection_new ();
+         uuid = nm_utils_uuid_generate ();
+-- 
+1.7.3.4
+
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index a1ce2f0..489965a 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct  6 04:27:50 UTC 2011 - glin@suse.com
+
+- Add gnome-control-center-network-allocate-nm-connection.patch:
+  allocate nm-connection for nma-wireless-dialog so that the user
+  can configure the wireless conection settings. bgo#648174
+
 -------------------------------------------------------------------
 Mon Oct  3 07:36:56 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 8f0f30b..75a8909 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -70,6 +70,8 @@ Summary:        The GNOME Control Center
 Source:         http://download.gnome.org/sources/gnome-control-center/3.2/%{name}-%{version}.tar.bz2
 # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
 Patch14:        gnome-control-center-system-proxy-configuration.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-network-allocate-nm-connection.patch bgo#648174 glin@suse.com -- Allocate nm-connection for nma-wireless-dialog
+Patch15:        gnome-control-center-network-allocate-nm-connection.patch
 Url:            http://www.gnome.org
 # needed for printers panel
 Requires:       cups-pk-helper
@@ -131,6 +133,7 @@ various aspects of your desktop.
 translation-update-upstream
 #NEEDS-REBASE
 #%patch14 -p1
+%patch15 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh