diff --git a/accountsservice.changes b/accountsservice.changes
index c4c5dcb..3cf6dcf 100644
--- a/accountsservice.changes
+++ b/accountsservice.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 22 03:05:02 UTC 2017 - qzheng@suse.com
+
+- Add remove-no-longer-used-system-accounts.patch:
+  Drop operator, nobody4 and noaccess form the blacklist 
+  (bsc#1063794, fdo#103879).
+
 -------------------------------------------------------------------
 Thu Aug 10 09:33:16 UTC 2017 - yfjiang@suse.com
 
diff --git a/accountsservice.spec b/accountsservice.spec
index 3ebda56..79e331d 100644
--- a/accountsservice.spec
+++ b/accountsservice.spec
@@ -31,6 +31,8 @@ Patch0:         accountsservice-sysconfig.patch
 Patch1:         accountsservice-filter-suse-accounts.patch
 # PATCH-FEATURE-SLE as-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
 Patch2:         as-fate318433-prevent-same-account-multi-logins.patch
+# PATCH-FIX-UPSTREAM remove-no-longer-used-system-accounts.patch bsc#1063794 fdo#103879 qzheng@suse.com -- drop operator, nobody4 and noaccess form the blacklist.
+Patch3:         remove-no-longer-used-system-accounts.patch
 # needed for patch0
 BuildRequires:  gnome-common
 BuildRequires:  gobject-introspection-devel
@@ -90,6 +92,7 @@ querying and manipulating user account information.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch3 -p1
 %if !0%{?is_opensuse}
 %patch2 -p1
 %endif
diff --git a/remove-no-longer-used-system-accounts.patch b/remove-no-longer-used-system-accounts.patch
new file mode 100644
index 0000000..1cc5b97
--- /dev/null
+++ b/remove-no-longer-used-system-accounts.patch
@@ -0,0 +1,15 @@
+diff --git a/src/user-classify.c b/src/user-classify.c
+index 9b4af06..4b3fdd1 100644
+--- a/src/user-classify.c
++++ b/src/user-classify.c
+@@ -39,10 +39,7 @@ static const char *default_excludes[] = {
+         "mail",
+         "news",
+         "uucp",
+-        "operator",
+         "nobody",
+-        "nobody4",
+-        "noaccess",
+         "postgres",
+         "pvm",
+         "rpm",