diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 24fc83c045f..af8a865f3eb 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/01/17 15:00:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2011/01/17 17:49:19 ajacoutot Exp $
 
 COMMENT=	cross-platform configuration modules
 
 GNOME_VERSION=	2.10.1
 GNOME_PROJECT=	system-tools-backends
 
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	sysutils
 
diff --git a/sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm b/sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm
index 75bbaf6bf82..df01f101f36 100644
--- a/sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm
+++ b/sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm
@@ -1,12 +1,69 @@
-$OpenBSD: patch-Init_ServicesList_pm,v 1.1 2011/01/17 00:36:28 ajacoutot Exp $
---- Init/ServicesList.pm.orig	Mon Jan 17 01:34:25 2011
-+++ Init/ServicesList.pm	Mon Jan 17 01:34:41 2011
-@@ -177,6 +177,8 @@ sub is_forbidden
+$OpenBSD: patch-Init_ServicesList_pm,v 1.2 2011/01/17 17:49:19 ajacoutot Exp $
+--- Init/ServicesList.pm.orig	Sat Mar 13 10:37:16 2010
++++ Init/ServicesList.pm	Mon Jan 17 18:48:10 2011
+@@ -177,6 +177,17 @@ sub is_forbidden
       "ureadahead",
       "wpa-ifupdown",
       "x11-common",
-+     # This was found in OpenBSD
++     # This was found in OpenBSD. Some scripts are blacklisted because
++     # they're supposed to be started by a master script,
++     # e.g. samba -> smbd+nmbd.
++     "nmbd",
 +     "rc.subr",
++     "smbd",
++     "zarafa_gateway",
++     "zarafa_ical",
++     "zarafa_monitor",
++     "zarafa_server",
++     "zarafa_spooler",
      ];
  
    foreach $i (@$service_forbidden_list)
+@@ -225,6 +236,7 @@ sub get_role
+     "am-utils" => "AUTOMOUNTER",
+     "amavis" => "ANTIVIRUS",
+     "amavis-ng" => "ANTIVIRUS",
++    "amavisd" => "ANTIVIRUS",
+     "apache" => "WEB_SERVER",
+     "apache-perl" => "WEB_SERVER",
+     "apache-ssl" => "WEB_SERVER",
+@@ -242,6 +254,7 @@ sub get_role
+     "chargen-udp" => "NETWORK",
+     "cherokee" => "WEB_SERVER",
+     "clamav-daemon" => "ANTIVIRUS",
++    "clamd" => "ANTIVIRUS",
+     "courier" => "MTA",
+     "courier-mta" => "MTA",
+     "cpufreqd" => "SYSTEM",
+@@ -252,6 +265,7 @@ sub get_role
+     "daytime" => "NETWORK",
+     "daytime-udp" => "NETWORK",
+     "dbus-1" => "SYSTEM",
++    "dbus_daemon" => "SYSTEM",
+     "ddclient" => "DYNAMIC_DNS",
+     "dhis-client" => "DYNAMIC_DNS",
+     "dictd" => "DICT",
+@@ -293,6 +307,7 @@ sub get_role
+     "modules" => "SYSTEM",
+     "module-init-tools" => "SYSTEM",
+     "mysql" => "DATABASE_SERVER",
++    "mysqld" => "DATABASE_SERVER",
+     "muddleftpd" => "FTP_SERVER",
+     "named" => "NETWORK",
+     "netfs" => "SYSTEM",
+@@ -335,6 +350,7 @@ sub get_role
+     "services" => "NETWORK",
+     "setserial" => "SYSTEM",
+     "sgi_fam" => "SYSTEM",
++    "smartd" => "SYSTEM",
+     "smartmontools" => "SYSTEM",
+     "spamassassin" => "SYSTEM",
+     "snmpd"	=> "NETWORK",
+@@ -352,6 +368,7 @@ sub get_role
+     "wdm"	=> "DISPLAY_MANAGER",
+     "webmin" => "SYSTEM",	 # FIXME as well
+     "winbind" => "NETWORK",
++    "winbindd" => "NETWORK",
+     "wine" => "SYSTEM",	 # FIXME like vmware
+     "wu-ftpd" => "FTP_SERVER",
+     "wzdftpd" => "FTP_SERVER",