diff --git a/openldap2.changes b/openldap2.changes
index f21e62e..7845b3f 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jun  7 10:20:45 UTC 2020 - Michael Ströder <michael@stroeder.com>
+
+- More .spec cleanups
+
 -------------------------------------------------------------------
 Fri Jun  5 11:25:16 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/openldap2.spec b/openldap2.spec
index 08dfc15..712992e 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openldap2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,7 +40,7 @@ License:        OLDAP-2.8
 Group:          Productivity/Networking/LDAP/Servers
 Version:        %{version_main}
 Release:        0
-Url:            https://www.openldap.org
+URL:            https://www.openldap.org
 Source:         https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version_main}.tgz
 Source1:        slapd.conf
 Source2:        slapd.conf.olctemplate
@@ -232,7 +232,7 @@ Version:        %{version_ppolicy_check_module}
 Release:        0
 Summary:        Password quality check module for OpenLDAP
 Group:          Productivity/Networking/LDAP/Servers
-Url:            https://github.com/onyxpoint/ppolicy-check-password
+URL:            https://github.com/onyxpoint/ppolicy-check-password
 BuildRequires:  cracklib-devel
 Requires:       openldap2 = %version_main
 Recommends:     cracklib cracklib-dict-full
@@ -347,11 +347,11 @@ make SLAPD_DEBUG=0 test
 %install
 mkdir -p %{buildroot}%{_libdir}/openldap
 mkdir -p %{buildroot}/usr/lib/openldap
-mkdir -p %{buildroot}/usr/sbin
-mkdir -p %{buildroot}/%{_unitdir}
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_unitdir}
 make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install
 # Additional symbolic link to slapd executable in /usr/sbin/
-ln -s %{_libdir}/slapd %{buildroot}/usr/sbin/slapd
+ln -s %{_libexecdir}/slapd %{buildroot}%{_sbindir}/slapd
 # Install selected contrib overlays
 for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/argon2 passwd/sha2 passwd/pbkdf2 trace
 do
@@ -367,8 +367,8 @@ install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sasl2/slapd.conf
 install -m 755 -d %{buildroot}/var/lib/ldap
 chmod a+x %{buildroot}%{_libdir}/liblber.so*
 chmod a+x %{buildroot}%{_libdir}/libldap_r.so*
-install -m 755 %{SOURCE6} %{buildroot}/usr/sbin/schema2ldif
-install -m 755 %{SOURCE17} %{buildroot}/usr/sbin
+install -m 755 %{SOURCE6} %{buildroot}%{_sbindir}/schema2ldif
+install -m 755 %{SOURCE17} %{buildroot}%{_sbindir}
 mkdir -p  %{buildroot}%{_tmpfilesdir}/
 install -m 644 %{SOURCE18} %{buildroot}%{_tmpfilesdir}/
 install -m 644 %{SOURCE3}  %{buildroot}/usr/lib/openldap/