diff --git a/openldap2.changes b/openldap2.changes
index 6a08fad..11f5064 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun  7 09:32:52 UTC 2017 - hguo@suse.com
+
+- Remove legacy daemon control that was used to migrate from SLE 11
+  to 12. (bsc#1038405)
+
 -------------------------------------------------------------------
 Tue Jun  6 13:47:18 UTC 2017 - hguo@suse.com
 
diff --git a/openldap2.spec b/openldap2.spec
index 4facabd..5c87e85 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -431,9 +431,6 @@ ln -s libldap_r-2.4.so.2 "%{buildroot}/%{_libdir}/libldap-2.4.so.2"
 %pre
 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
 %service_add_pre slapd.service
 
 %post
@@ -442,11 +439,7 @@ if [ ${1:-0} -gt 1 ] && [ -f %{_libdir}/sasl2/slapd.conf ] ; then
   cp %{_libdir}/sasl2/slapd.conf /etc/sasl2/slapd.conf
 fi
 %{fillup_only -n openldap ldap}
-%{remove_and_set -n openldap OPENLDAP_RUN_DB_RECOVER}
 %service_add_post slapd.service
-if [ -f %{_rundir}/enable_slapd_service ]; then
-    /usr/bin/systemctl --quiet enable slapd
-fi
 
 %post -n libldap-2_4-2 -p /sbin/ldconfig