diff --git a/geoclue2.spec b/geoclue2.spec
index bbec4b7..9d9a3b0 100644
--- a/geoclue2.spec
+++ b/geoclue2.spec
@@ -1,6 +1,6 @@
 Name:           geoclue2
 Version:        1.99.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Geolocation service
 
 License:        GPLv2+
@@ -13,6 +13,7 @@ BuildRequires:  intltool
 BuildRequires:  itstool
 BuildRequires:  json-glib-devel
 BuildRequires:  libsoup-devel
+Requires(pre):  shadow-utils
 Requires:       dbus
 
 %description
@@ -45,7 +46,7 @@ for running on IP address geolocation servers.
 
 
 %build
-%configure
+%configure --with-dbus-service-user=geoclue
 make %{?_smp_mflags} V=1
 
 
@@ -53,6 +54,14 @@ make %{?_smp_mflags} V=1
 %make_install
 
 
+%pre
+getent group geoclue >/dev/null || groupadd -r geoclue
+getent passwd geoclue >/dev/null || \
+    useradd -r -g geoclue -d / -s /sbin/nologin \
+    -c "User for geoclue" geoclue
+exit 0
+
+
 %files
 %doc COPYING NEWS
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.GeoClue2.conf
@@ -70,6 +79,9 @@ make %{?_smp_mflags} V=1
 
 
 %changelog
+* Thu Sep 19 2013 Kalev Lember <kalevlember@gmail.com> - 1.99.4-2
+- Run the service as 'geoclue' user
+
 * Wed Sep 18 2013 Kalev Lember <kalevlember@gmail.com> - 1.99.4-1
 - Update to 1.99.4