diff --git a/openldap2.changes b/openldap2.changes
index 307c775..249d565 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 23 22:46:29 UTC 2016 - jengelh@inai.de
+
+- Test for user/group existence before trying to add them.
+  Summary spello update.
+
 -------------------------------------------------------------------
 Thu Jun 16 10:10:36 UTC 2016 - hguo@suse.com
 
diff --git a/openldap2.spec b/openldap2.spec
index 2799090..bbeb889 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -134,7 +134,7 @@ stored in a Relational (SQL) Database as an LDAP subtree without the need
 to do any programming.
 
 %package -n libldap-data
-Summary:        Configuration file for system-wide defaults for all usages of libldap.
+Summary:        Configuration file for system-wide defaults for all uses of libldap
 Group:          Productivity/Networking/LDAP
 %if 0%{?suse_version} != 1110
 BuildArch:      noarch
@@ -170,14 +170,10 @@ Provides:       openldap2:/usr/share/doc/packages/openldap2/drafts/README
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
+
 %description doc
 The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts.
 
-Authors:
---------
-    The OpenLDAP Project <project@openldap.org>
-
-
 %package client
 Summary:        OpenLDAP client utilities
 Group:          Productivity/Networking/LDAP/Clients
@@ -426,8 +422,8 @@ rm -f ${RPM_BUILD_ROOT}/usr/share/man/man5/slapd-tcl.5
 rm -f  ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
 %pre
-/usr/sbin/groupadd -g 70 -o -r ldap || :
-/usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/false -c "User for OpenLDAP" -d /var/lib/ldap ldap || :
+getent group ldap >/dev/null || /usr/sbin/groupadd -g 70 -o -r ldap || :
+getent passwd ldap >/dev/null || /usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/false -c "User for OpenLDAP" -d /var/lib/ldap ldap || :
 if /usr/bin/chkconfig ldap 2>&1 | grep -q on; then
     touch %{_rundir}/enable_slapd_service
 fi