diff --git a/openldap2-client.changes b/openldap2-client.changes
index bd07c7c..44c8bf7 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 19 15:05:27 UTC 2011 - rhafer@suse.de
+
+- Install the correct schema2ldif script (bnc#665530) 
+
 -------------------------------------------------------------------
 Wed Jan  5 15:48:27 UTC 2011 - rhafer@novell.com
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index e4dac30..7f8faec 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2-client (Version 2.4.23)
+# spec file for package openldap2 (Version 2.4.23)
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 %define run_test_suite 1
 
-Name:           openldap2-client
+Name:         openldap2-client
 BuildRequires:  cyrus-sasl-devel libopenssl-devel
 %if %sles_version == 9 || %sles_version == 10
 BuildRequires:  -libopenssl-devel -pwdutils openssl-devel
@@ -80,14 +80,6 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
-This package contains the OpenLDAP client utilities.
-
-
-Authors:
---------
-    The OpenLDAP Project <project@openldap.org>
-
-
 %package      -n openldap2-back-perl
 License:        BSD3c(or similar) ; openldap 2.8
 Summary:        OpenLDAP Perl Back-End
@@ -163,17 +155,6 @@ Authors:
 %else
 
 %description
-The Lightweight Directory Access Protocol (LDAP) is used to access
-online directory services. It runs directly over TCP and can be used to
-access a stand-alone LDAP directory service or to access a directory
-service that has an X.500 back-end.
-
-
-
-Authors:
---------
-    The OpenLDAP Project <project@openldap.org>
-
 This package contains the OpenLDAP client utilities.
 
 
@@ -347,7 +328,7 @@ install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so*
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif
+install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/schema2ldif
 %if "%{name}" == "openldap2"
 %define DOCDIR %{_defaultdocdir}/%{name}
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
diff --git a/openldap2.changes b/openldap2.changes
index bd07c7c..44c8bf7 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 19 15:05:27 UTC 2011 - rhafer@suse.de
+
+- Install the correct schema2ldif script (bnc#665530) 
+
 -------------------------------------------------------------------
 Wed Jan  5 15:48:27 UTC 2011 - rhafer@novell.com
 
diff --git a/openldap2.spec b/openldap2.spec
index c7aa7a0..2048cd5 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -328,7 +328,7 @@ install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so*
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif
+install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/schema2ldif
 %if "%{name}" == "openldap2"
 %define DOCDIR %{_defaultdocdir}/%{name}
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates