diff --git a/openldap2.changes b/openldap2.changes
index fa4a511..cfdbf1a 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 25 11:06:12 UTC 2016 - hguo@suse.com
+
+- Move ldap.conf into libldap-data package, per convention.
+
 -------------------------------------------------------------------
 Sun Feb 21 23:04:38 UTC 2016 - jengelh@inai.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 6d538fb..e291383 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -138,19 +138,16 @@ 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
+%package -n libldap-data
+Summary:        Configuration file for system-wide defaults for all usages of 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.
+%description -n libldap-data
+The subpackage contains a configuration file used to set system-wide defaults
+to be applied with all usages of libldap.
 
 %package contrib
 Summary:        OpenLDAP Contrib Modules
@@ -224,7 +221,7 @@ for development.
 %package      -n libldap-2_4-2
 Summary:        OpenLDAP Client Libraries
 Group:          Productivity/Networking/LDAP/Clients
-Recommends:     openldap2-client-config
+Recommends:     libldap-data >= %{version_main}
 
 %description -n libldap-2_4-2
 This package contains the OpenLDAP client libraries.
@@ -563,7 +560,7 @@ fi
 %doc servers/slapd/back-sql/docs/bugs
 %doc servers/slapd/back-sql/docs/install
 
-%files client-config
+%files -n libldap-data
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/openldap/ldap.conf
 %doc %{_mandir}/man5/ldap.conf*