diff --git a/0001-network-Fix-empty-Wifi-list.patch b/0001-network-Fix-empty-Wifi-list.patch
new file mode 100644
index 0000000..4f6d0f2
--- /dev/null
+++ b/0001-network-Fix-empty-Wifi-list.patch
@@ -0,0 +1,53 @@
+From 28c54f3d551af09c414fbf2e2e13a9f7b61781f9 Mon Sep 17 00:00:00 2001
+From: Jonathan Kang <jonathan121537@gmail.com>
+Date: Tue, 5 Apr 2016 14:15:20 +0800
+Subject: [PATCH] network: Fix empty Wifi list
+
+Add a callback function for signals "access-point-added" and
+"access-point-removed" to update the Wifi list.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=709641
+---
+ panels/network/net-device-wifi.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
+index e7d0c93..ca55d94 100644
+--- a/panels/network/net-device-wifi.c
++++ b/panels/network/net-device-wifi.c
+@@ -240,6 +240,18 @@ get_ap_security_string (NMAccessPoint *ap)
+ }
+ 
+ static void
++net_device_wifi_access_point_changed (NMDeviceWifi *nm_device_wifi,
++                                      NMAccessPoint *ap,
++                                      gpointer user_data)
++{
++        NetDeviceWifi *device_wifi;
++
++        device_wifi = NET_DEVICE_WIFI (user_data);
++
++        populate_ap_list (device_wifi);
++}
++
++static void
+ wireless_enabled_toggled (NMClient       *client,
+                           GParamSpec     *pspec,
+                           NetDeviceWifi *device_wifi)
+@@ -1317,6 +1329,13 @@ net_device_wifi_constructed (GObject *object)
+ 
+         nm_device = net_device_get_nm_device (NET_DEVICE (device_wifi));
+ 
++        g_signal_connect_object (nm_device, "access-point-added",
++                                 G_CALLBACK (net_device_wifi_access_point_changed),
++                                 device_wifi, 0);
++        g_signal_connect_object (nm_device, "access-point-removed",
++                                 G_CALLBACK (net_device_wifi_access_point_changed),
++                                 device_wifi, 0);
++
+         /* only enable the button if the user can create a hotspot */
+         widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder,
+                                                      "start_hotspot_button"));
+-- 
+2.6.2
+
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 6e3116d..c814648 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 30 10:26:26 UTC 2016 - sckang@suse.com
+
+- Add 0001-network-Fix-empty-Wifi-list.patch: Fix Wifi list not
+  showing APs correctly (bsc#870322, bgo#709641).
+
 -------------------------------------------------------------------
 Mon Mar 21 14:45:14 UTC 2016 - dimstar@opensuse.org
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index c1721f6..eb4077b 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -52,6 +52,8 @@ Patch16:        gnome-control-center-probe-radius-server-cert.patch
 Patch17:        gnome-control-center-follow-polkit-permissions-for-tz.patch
 # PATCH-FIX-SLE gnome-control-center-890979-change-remote-passwd.patch bnc#890979 dliang@suse.com -- user: Enable remote user to change password in user panel
 Patch18:        gnome-control-center-890979-change-remote-passwd.patch
+# PATCH-FIX-UPSTREAM 0001-network-Fix-empty-Wifi-list.patch bsc#870322 bgo#709641 sckang@suse.com -- Fix Wifi list not showing APs corretcly
+Patch19:        0001-network-Fix-empty-Wifi-list.patch
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -199,6 +201,7 @@ translation-update-upstream
 %if ! 0%{?is_opensuse}
 %patch18 -p1
 %endif
+%patch19 -p1
 #NEEDS-REBASE
 #patch14 -p1