diff --git a/gnome-control-center-890979-change-remote-passwd.patch b/gnome-control-center-890979-change-remote-passwd.patch
deleted file mode 100644
index 6937354..0000000
--- a/gnome-control-center-890979-change-remote-passwd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
-index 4f11a0a..1bb7738 100644
---- a/panels/user-accounts/um-user-panel.c
-+++ b/panels/user-accounts/um-user-panel.c
-@@ -900,7 +900,10 @@ show_user (ActUser *user, CcUserPanelPrivate *d)
- 
-         widget = get_widget (d, "account-password-button-label");
-         gtk_label_set_label (GTK_LABEL (widget), get_password_mode_text (user));
-+/*      Enable the remote account also.
-         enable = act_user_is_local_account (user);
-+*/
-+        enable = TRUE;
-         gtk_widget_set_sensitive (widget, enable);
- 
-         widget = get_widget (d, "autologin-switch");
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 5a21a4a..24662d8 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May  8 10:21:28 UTC 2018 - qkzhu@suse.com
+
+- Drop gnome-control-center-890979-change-remote-passwd.patch:
+  Remote password could be changed without this patch.
+- Enable gnome-control-center-info-never-use-gnome-software.patch,
+  gnome-control-center-more-power-button-actions.patch and
+  gnome-control-center-bring-back-firewall-zone.patch in Leap15
+  (bsc#1091305).
+
 -------------------------------------------------------------------
 Tue Apr 17 09:44:03 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index f344914..48e1b2d 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -32,15 +32,13 @@ 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
-### SLE-only patches get 1000 or more as number.
-# PATCH-FEATURE-SLE gnome-control-center-890979-change-remote-passwd.patch bnc#890979 dliang@suse.com -- user: Enable remote user to change password in user panel
-Patch1000:      gnome-control-center-890979-change-remote-passwd.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
 # PATCH-FEATURE-SLE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions.
@@ -183,9 +181,8 @@ GNOME control center.
 %patch1 -p1
 translation-update-upstream
 
-# SLE-only patches 1000+
-%if !0%{?is_opensuse}
-%patch1000 -p1
+# patches for Leap >= 15 plus SLE >= 15, but not TW
+%if 0%{?sle_version} >= 150000
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1