diff --git a/.cvsignore b/.cvsignore
index 34bf73f..763c2e1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-system-config-samba-1.2.63.tar.bz2
+system-config-samba-1.2.64.tar.bz2
diff --git a/sources b/sources
index e88e5e2..6442d89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-818c71bc1131d2294e19f945af6fafc8  system-config-samba-1.2.63.tar.bz2
+637a999eeb7ab3309091ddb50209687b  system-config-samba-1.2.64.tar.bz2
diff --git a/system-config-samba.spec b/system-config-samba.spec
index 3e48f97..945de0f 100644
--- a/system-config-samba.spec
+++ b/system-config-samba.spec
@@ -1,16 +1,7 @@
-# Command line configurables
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
-%bcond_without libuser_python
-%else
-%bcond_with libuser_python
-%endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
+%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6
-%bcond_without console_util
-%else
-%bcond_with console_util
-%endif
+# Command line configurables
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
 %bcond_without rarian_compat
@@ -20,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.63
+Version: 1.2.64
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPLv2+
@@ -30,6 +21,8 @@ BuildArch: noarch
 # We are upstream, thus the source is only available from within this source
 # package.
 Source0: %{name}-%{version}.tar.bz2
+BuildRequires: python
+BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -41,21 +34,14 @@ BuildRequires: rarian-compat
 BuildRequires: scrollkeeper
 %endif
 Obsoletes: redhat-config-samba < 1.1.5
+Requires: dbus-python
+Requires: PolicyKit-gnome
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python
-%if 0%{?with_console_util:1}
-Requires: usermode >= 1.94
-%else
-Requires: usermode >= 1.36
-%endif
+Requires: python-slip-dbus >= 0.1.7
 Requires: samba
 Requires: samba-common
-%if 0%{?with_libuser_python:1}
-Requires: libuser-python
-%else
-Requires: libuser
-%endif
 Requires: hicolor-icon-theme
 
 %description
@@ -66,7 +52,7 @@ modifying, and deleting samba shares.
 %setup -q
 
 %build
-make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -105,10 +91,33 @@ fi
 %{_datadir}/system-config-samba
 %{_datadir}/applications/system-config-samba.desktop
 %{_datadir}/icons/hicolor/48x48/apps/system-config-samba.png
-%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-samba
-%config(noreplace) %{_sysconfdir}/pam.d/system-config-samba
+%{_sysconfdir}/dbus-1/system.d/*.conf
+%{_datadir}/dbus-1/system-services/*.service
+%{_datadir}/PolicyKit/policy/*.policy
+%{python_sitelib}/scsamba
+%{python_sitelib}/scsamba-%{version}-py%{python_version}.egg-info
+%{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Tue Aug 19 2008 Nils Philippsen <nphilipp@redhat.com> - 1.2.64-1
+- install dbus service mechanism
+
+* Mon Aug 18 2008 Nils Philippsen <nphilipp@redhat.com>
+- add python, python-devel build requirements
+- remove usermode, libuser-python requirements
+- add dbus-python, PolicyKit-gnome, python-slip-dbus requirements
+- ship dbus, PolicyKit configuration and scsamba python module
+
+* Fri Aug 15 2008 Nils Philippsen <nphilipp@redhat.com>
+- use dbus/PolicyKit for privileged operations in the frontend
+- use pwd.getpwall () instead of libuser for user enumeration
+
+* Wed Aug 13 2008 Nils Philippsen <nphilipp@redhat.com>
+- implement dbus service wrapping the backend
+
+* Tue Aug 12 2008 Nils Philippsen <nphilipp@redhat.com>
+- restructure source, prepare for dbus/PolicyKit
+
 * Tue Apr 08 2008 Nils Philippsen <nphilipp@redhat.com> - 1.2.63-1
 - pick up updated translations