diff --git a/accountsservice-filter-more-accounts.patch b/accountsservice-filter-more-accounts.patch
new file mode 100644
index 0000000..4a8d12f
--- /dev/null
+++ b/accountsservice-filter-more-accounts.patch
@@ -0,0 +1,29 @@
+commit abd78a5a184f012aecdb8b3795b91c854e1fbece
+Author: Ray Strode <rstrode@redhat.com>
+Date:   Mon Apr 2 16:52:19 2012 -0400
+
+    daemon: extend blacklist
+    
+    Since commit 552a0c856a6e3a7c2e6450ab80e79f4204062281 we no
+    longer hide certain system users that have a shell.
+    
+    This commit adds a few more users to our blacklist to keep
+    things running smooth.
+    
+    Ideally, we'll find a more general solution.
+
+diff --git a/src/daemon.c b/src/daemon.c
+index 3ca232b..d186ab6 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -75,6 +75,10 @@ static const char *default_excludes[] = {
+         "rpm",
+         "nfsnobody",
+         "pcap",
++        "mysql",
++        "ftp",
++        "games",
++        "man",
+         NULL
+ };
+ 
diff --git a/accountsservice-filter-suse-accounts.patch b/accountsservice-filter-suse-accounts.patch
new file mode 100644
index 0000000..f7b9c03
--- /dev/null
+++ b/accountsservice-filter-suse-accounts.patch
@@ -0,0 +1,13 @@
+Index: accountsservice-0.6.17/src/daemon.c
+===================================================================
+--- accountsservice-0.6.17.orig/src/daemon.c
++++ accountsservice-0.6.17/src/daemon.c
+@@ -79,6 +79,8 @@ static const char *default_excludes[] =
+         "ftp",
+         "games",
+         "man",
++        "beagleindex",
++        "suse-ncc",
+         NULL
+ };
+ 
diff --git a/accountsservice.changes b/accountsservice.changes
index b88e33e..e8da442 100644
--- a/accountsservice.changes
+++ b/accountsservice.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr  3 11:45:58 UTC 2012 - vuntz@opensuse.org
+
+- Add accountsservice-filter-more-accounts.patch: filter out ftp,
+  games, man and mysql system users too, taken from git.
+- Add accountsservice-filter-suse-accounts.patch: filter out some
+  openSUSE-specific accounts (beagleindex, suse-ncc).
+
 -------------------------------------------------------------------
 Wed Mar 28 06:36:18 UTC 2012 - vuntz@opensuse.org
 
diff --git a/accountsservice.spec b/accountsservice.spec
index a54715c..8a629de 100644
--- a/accountsservice.spec
+++ b/accountsservice.spec
@@ -27,6 +27,10 @@ Source:         http://www.freedesktop.org/software/accountsservice/%{name}-%{ve
 # WARNING: do not remove/significantly change patch0 without updating the relevant patch in gdm too
 # PATCH-FIX-OPENSUSE accountsservice-sysconfig.patch bnc#688071 vuntz@opensuse.org -- Read/write autologin configuration from sysconfig, like gdm (see gdm-sysconfig-settings.patch)
 Patch0:         accountsservice-sysconfig.patch
+# PATCH-FIX-UPSTREAM accountsservice-filter-more-accounts.patch fdo#48178 vuntz@opensuse.org -- Filter out some additional system users; taken from git.
+Patch1:         accountsservice-filter-more-accounts.patch
+# PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vuntz@opensuse.org -- Filter out some system users that are specific to openSUSE
+Patch2:         accountsservice-filter-suse-accounts.patch
 # needed for patch0
 BuildRequires:  gnome-common
 BuildRequires:  gobject-introspection-devel
@@ -86,6 +90,8 @@ querying and manipulating user account information.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 # needed for patch0