diff --git a/control-center-ignore-unmanaged-wifi-devices.patch b/control-center-ignore-unmanaged-wifi-devices.patch
new file mode 100644
index 0000000..da685c3
--- /dev/null
+++ b/control-center-ignore-unmanaged-wifi-devices.patch
@@ -0,0 +1,27 @@
+From cb760e77af0b566f6fcc96fe162a875403665877 Mon Sep 17 00:00:00 2001
+From: Jonathan Kang <jonathan121537@gmail.com>
+Date: Mon, 21 May 2018 15:23:04 +0800
+Subject: [PATCH] wifi: only manage Wi-Fi devices managed by NM
+
+If a Wi-Fi device is unmanaged by NetworkManager, ignore it.
+---
+ panels/network/cc-wifi-panel.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
+index d785bad0d..8db43c349 100644
+--- a/panels/network/cc-wifi-panel.c
++++ b/panels/network/cc-wifi-panel.c
+@@ -91,7 +91,8 @@ add_wifi_device (CcWifiPanel *self,
+   NetObject *net_device;
+ 
+   /* Only manage Wi-Fi devices */
+-  if (!NM_IS_DEVICE_WIFI (device))
++  if (!NM_IS_DEVICE_WIFI (device) ||
++      !nm_device_get_managed (device))
+     return;
+ 
+   /* Create the NetDevice */
+-- 
+2.17.0
+
diff --git a/gnome-control-center-3.28.1.tar.xz b/gnome-control-center-3.28.1.tar.xz
deleted file mode 100644
index 1706b1c..0000000
--- a/gnome-control-center-3.28.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c65e56d42e2f8d1fd93ea0afe8c4eafcd4594adc45e2b0d8c069d0f557485738
-size 5854488
diff --git a/gnome-control-center-3.28.2.tar.xz b/gnome-control-center-3.28.2.tar.xz
new file mode 100644
index 0000000..7b27fca
--- /dev/null
+++ b/gnome-control-center-3.28.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff9e3d7c1693c6004c8a337eb84452d517259b52330081b6b226a8ac5793d734
+size 5857128
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 24662d8..ab59436 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue May 29 20:18:34 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.28.2:
+  + Don't pass --overview on desktop file.
+  + Display: Fix crashes on Night Light dialog.
+  + Network: Fix various Bluetooth and VPN issues.
+  + User Accounts:
+    - Fix building without Cheese.
+    - Fix wrong enterprise user/password hint.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri May 25 00:25:57 UTC 2018 - sckang@suse.com
+
+- Add control-center-ignore-unmanaged-wifi-devices.patch:
+  wifi: only manage Wi-Fi devices managed by NM (bsc#1079320).
+
 -------------------------------------------------------------------
 Tue May  8 10:21:28 UTC 2018 - qkzhu@suse.com
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 48e1b2d..e9f9c22 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -27,17 +27,19 @@
 %{?with_ibus:BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2}
 %{?with_wacom:BuildRequires: pkgconfig(clutter-1.0) >= 1.11.3 pkgconfig(libwacom) >= 0.7}
 Name:           gnome-control-center
-Version:        3.28.1
+Version:        3.28.2
 Release:        0
 Summary:        The GNOME Control Center
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-Url:            https://www.gnome.org
+URL:            https://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-control-center/3.28/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running was:PATCH-FIX-OPENSUSE
 Patch0:         gnome-control-center-disable-error-message-for-NM.patch
 # PATCH-FIX-UPSTREAM control-center-network-add-domain-suffix-match.patch bgo#787882 bsc#1047509 sckang@suse.com -- wifi: Add domain-suffix-match entry
 Patch1:         control-center-network-add-domain-suffix-match.patch
+# PATCH-FIX-UPSTREAM control-center-ignore-unmanaged-wifi-devices.patch bsc#1079320 glgo#GNOME/gnome-control-center#54 sckang@suse.com -- wifi: only manage Wi-Fi devices managed by NM
+Patch2:         control-center-ignore-unmanaged-wifi-devices.patch
 ### patches for Leap >= 15 plus SLE >= 15, but not TW
 # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
 Patch1001:      gnome-control-center-info-never-use-gnome-software.patch
@@ -179,6 +181,7 @@ GNOME control center.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 translation-update-upstream
 
 # patches for Leap >= 15 plus SLE >= 15, but not TW