diff --git a/openldap2-client.changes b/openldap2-client.changes
index ad5ff78..a3cbb7c 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 22 09:46:04 UTC 2011 - rhafer@suse.de
+
+- Surpress gcc warnings about extra format string arguments for 2.3.x
+  built as well.
+
 -------------------------------------------------------------------
 Mon Feb 14 11:09:36 UTC 2011 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index fba0c87..4af0377 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2-client
+# spec file for package openldap2
 #
 # 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
@@ -33,11 +33,11 @@ BuildRequires:  db-devel openslp-devel tcpd-devel unixODBC-devel
 %if %sles_version == 9 || %sles_version == 10
 BuildRequires:  -db-devel libdb-4_5-devel
 %endif
-Group:          Productivity/Networking/LDAP/Clients
+Group:          Productivity/Networking/LDAP/Servers
 Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
-Summary:        The OpenLDAP commandline client tools
+Summary:        The OpenLDAP Server
 %else
 Group:          Productivity/Networking/LDAP/Clients
 Conflicts:      openldap-client
@@ -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.
 
 
@@ -293,7 +274,7 @@ cd ../openldap-2.3.37
 libtoolize --force
 #aclocal -I build
 autoreconf
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED"
+export CFLAGS="$RPM_OPT_FLAGS  -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED"
 ./configure --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var/run/slapd --libexecdir=/usr/lib/openldap \
         --libdir=%{_libdir} --mandir=%{_mandir} --enable-aci \
diff --git a/openldap2.changes b/openldap2.changes
index ad5ff78..a3cbb7c 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 22 09:46:04 UTC 2011 - rhafer@suse.de
+
+- Surpress gcc warnings about extra format string arguments for 2.3.x
+  built as well.
+
 -------------------------------------------------------------------
 Mon Feb 14 11:09:36 UTC 2011 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index c2f200c..7743397 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -33,11 +33,11 @@ BuildRequires:  db-devel openslp-devel tcpd-devel unixODBC-devel
 %if %sles_version == 9 || %sles_version == 10
 BuildRequires:  -db-devel libdb-4_5-devel
 %endif
-Group:          Productivity/Networking/LDAP/Clients
+Group:          Productivity/Networking/LDAP/Servers
 Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
-Summary:        The OpenLDAP commandline client tools
+Summary:        The OpenLDAP Server
 %else
 Group:          Productivity/Networking/LDAP/Clients
 Conflicts:      openldap-client
@@ -274,7 +274,7 @@ cd ../openldap-2.3.37
 libtoolize --force
 #aclocal -I build
 autoreconf
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED"
+export CFLAGS="$RPM_OPT_FLAGS  -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED"
 ./configure --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var/run/slapd --libexecdir=/usr/lib/openldap \
         --libdir=%{_libdir} --mandir=%{_mandir} --enable-aci \