diff --git a/openldap2-client.changes b/openldap2-client.changes
index 36850be..5b37953 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 13 15:20:40 UTC 2014 - coolo@suse.com
+
+- use %_rundir if available, otherwise /var/run
+
+-------------------------------------------------------------------
+Wed Apr 23 20:51:14 UTC 2014 - dmueller@suse.com
+
+- move systemd requires to server package 
+
 -------------------------------------------------------------------
 Tue Feb 18 14:39:07 UTC 2014 - ckornacker@suse.com
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index bc2374f..35f4635 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -19,6 +19,10 @@
 %define run_test_suite 0
 %define version_main 2.4.39
 
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+
 Name:           openldap2-client
 Summary:        The OpenLDAP commandline client tools
 License:        OLDAP-2.8
@@ -234,7 +238,7 @@ autoreconf
 export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE"
 export STRIP=""
 %configure \
-        --localstatedir=/var/run/slapd \
+        --localstatedir=%{_rundir}/slapd \
         --libexecdir=/usr/lib/openldap \
         --enable-wrappers \
         --enable-spasswd \
@@ -279,7 +283,7 @@ libtoolize --force
 #aclocal -I build
 autoreconf
 export CFLAGS="$RPM_OPT_FLAGS  -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS"
-%configure --localstatedir=/var/run/slapd --libexecdir=/usr/lib/openldap \
+%configure --localstatedir=%{_rundir}/slapd --libexecdir=/usr/lib/openldap \
         --enable-aci \
         --enable-hdb --enable-bdb --enable-ldbm --enable-crypt \
         --enable-ipv6=no \
@@ -361,7 +365,7 @@ install -m 644 servers/slapd/slapd.ldif \
 rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example
 rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README
 rm -f $RPM_BUILD_ROOT/etc/openldap/slapd.ldif*
-rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example
+rm -f $RPM_BUILD_ROOT%{_rundir}/slapd/openldap-data/DB_CONFIG.example
 mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples
 # Provide SUSE policy symlink /usr/sbin/rcFOO -> /etc/init.d/FOO
 # /usr/sbin/service exists only since openSUSE 12.3:
@@ -431,7 +435,7 @@ cat >openldap2.filelist <<EOF
 /usr/lib/openldap/start
 /usr/lib/systemd/system/slapd.service
 %dir %attr(0700, ldap, ldap) /var/lib/ldap
-%dir %attr(0755, ldap, ldap) %ghost /var/run/slapd
+%dir %attr(0755, ldap, ldap) %ghost %{_rundir}/slapd
 %doc %{_mandir}/man8/sl*
 %doc %{_mandir}/man5/slapd.*
 %doc %{_mandir}/man5/slapd-bdb.*
diff --git a/openldap2.changes b/openldap2.changes
index f5bda92..5b37953 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 13 15:20:40 UTC 2014 - coolo@suse.com
+
+- use %_rundir if available, otherwise /var/run
+
 -------------------------------------------------------------------
 Wed Apr 23 20:51:14 UTC 2014 - dmueller@suse.com
 
diff --git a/openldap2.spec b/openldap2.spec
index 863ac51..1dbe6e9 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -19,6 +19,10 @@
 %define run_test_suite 0
 %define version_main 2.4.39
 
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+
 Name:           openldap2
 Summary:        The OpenLDAP Server
 License:        OLDAP-2.8
@@ -234,7 +238,7 @@ autoreconf
 export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE"
 export STRIP=""
 %configure \
-        --localstatedir=/var/run/slapd \
+        --localstatedir=%{_rundir}/slapd \
         --libexecdir=/usr/lib/openldap \
         --enable-wrappers \
         --enable-spasswd \
@@ -279,7 +283,7 @@ libtoolize --force
 #aclocal -I build
 autoreconf
 export CFLAGS="$RPM_OPT_FLAGS  -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS"
-%configure --localstatedir=/var/run/slapd --libexecdir=/usr/lib/openldap \
+%configure --localstatedir=%{_rundir}/slapd --libexecdir=/usr/lib/openldap \
         --enable-aci \
         --enable-hdb --enable-bdb --enable-ldbm --enable-crypt \
         --enable-ipv6=no \
@@ -361,7 +365,7 @@ install -m 644 servers/slapd/slapd.ldif \
 rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example
 rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README
 rm -f $RPM_BUILD_ROOT/etc/openldap/slapd.ldif*
-rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example
+rm -f $RPM_BUILD_ROOT%{_rundir}/slapd/openldap-data/DB_CONFIG.example
 mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples
 # Provide SUSE policy symlink /usr/sbin/rcFOO -> /etc/init.d/FOO
 # /usr/sbin/service exists only since openSUSE 12.3:
@@ -431,7 +435,7 @@ cat >openldap2.filelist <<EOF
 /usr/lib/openldap/start
 /usr/lib/systemd/system/slapd.service
 %dir %attr(0700, ldap, ldap) /var/lib/ldap
-%dir %attr(0755, ldap, ldap) %ghost /var/run/slapd
+%dir %attr(0755, ldap, ldap) %ghost %{_rundir}/slapd
 %doc %{_mandir}/man8/sl*
 %doc %{_mandir}/man5/slapd.*
 %doc %{_mandir}/man5/slapd-bdb.*