diff --git a/ChangeLog b/ChangeLog
index 5f5c73cf..b22d6204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
+    
+	* dbus/dbus-sysdeps.c: moved global lock system_users from dbus-userdb.c
+
 2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
     
 	* global rename of function dbus_username_from_current_process
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index cf689bc0..7f779600 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -49,6 +49,7 @@
 
 _DBUS_DEFINE_GLOBAL_LOCK (win_fds);
 _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
+_DBUS_DEFINE_GLOBAL_LOCK (system_users);
 
 /**
  * @defgroup DBusSysdeps Internal system-dependent API
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 5a5d9098..6ef20553 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -218,7 +218,6 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
     }
 }
 
-_DBUS_DEFINE_GLOBAL_LOCK(system_users);
 static dbus_bool_t database_locked = FALSE;
 static DBusUserDatabase *system_db = NULL;
 static DBusString process_username;