diff --git a/openldap2.changes b/openldap2.changes
index 8feae47..fa4a511 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Feb 21 23:04:38 UTC 2016 - jengelh@inai.de
+
+- Move ldap.conf out of shlib package again, they are not allowed
+  there for obvious reasons (conflict with future package).
+
 -------------------------------------------------------------------
 Thu Feb 18 14:45:30 UTC 2016 - hguo@suse.com
 
diff --git a/openldap2.spec b/openldap2.spec
index ea15cec..6d538fb 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -138,6 +138,20 @@ The primary purpose of this OpenLDAP backend is to present information
 stored in a Relational (SQL) Database as an LDAP subtree without the need
 to do any programming.
 
+%package client-config
+Summary:        Example configuration skeleton for libldap
+Group:          Productivity/Networking/LDAP
+%if 0%{?suse_version} != 1110
+BuildArch:      noarch
+%endif
+
+%description client-config
+This subpackage contains an example configuration file for libldap.
+You can write your own configuration file (which is short in any
+case) without needing this package; conversely, if you install this,
+rpm may create and nag you with /etc/openldap/ldap.conf.rpmnew files
+whenever the template happens to get changed.
+
 %package contrib
 Summary:        OpenLDAP Contrib Modules
 Group:          Productivity/Networking/LDAP/Servers
@@ -210,6 +224,7 @@ for development.
 %package      -n libldap-2_4-2
 Summary:        OpenLDAP Client Libraries
 Group:          Productivity/Networking/LDAP/Clients
+Recommends:     openldap2-client-config
 
 %description -n libldap-2_4-2
 This package contains the OpenLDAP client libraries.
@@ -548,6 +563,12 @@ fi
 %doc servers/slapd/back-sql/docs/bugs
 %doc servers/slapd/back-sql/docs/install
 
+%files client-config
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/openldap/ldap.conf
+%doc %{_mandir}/man5/ldap.conf*
+%{_sysconfdir}/openldap/ldap.conf.default
+
 %files doc
 %defattr(-,root,root)
 %dir %{DOCDIR}
@@ -588,9 +609,6 @@ fi
 
 %files -n libldap-2_4-2
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/openldap/ldap.conf
-%doc %{_mandir}/man5/ldap.conf*
-%{_sysconfdir}/openldap/ldap.conf.default
 %{_libdir}/liblber*2.4.so.*
 %{_libdir}/libldap*2.4.so.*