diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes
index a0d5961..3ca4bcf 100644
--- a/cyrus-sasl-saslauthd.changes
+++ b/cyrus-sasl-saslauthd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 23 10:57:47 UTC 2009 - rhafer@novell.com
+
+- Fixed linker arguments for ldap- and sql-auxprop plugins 
+  (bnc#555568)
+
 -------------------------------------------------------------------
 Mon Jul 20 16:20:35 CEST 2009 - coolo@novell.com
 
diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec
index 10c5e21..7c3c434 100644
--- a/cyrus-sasl-saslauthd.spec
+++ b/cyrus-sasl-saslauthd.spec
@@ -20,7 +20,7 @@
 
 Name:           cyrus-sasl-saslauthd
 BuildRequires:  db-devel krb5-devel mysql-devel openldap2-devel opie pam-devel postgresql-devel
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Group:          Productivity/Networking/Other
 Url:            http://asg.web.cmu.edu/sasl/
 AutoReqProv:    on
@@ -28,7 +28,7 @@ Provides:       cyrus-sasl:/usr/sbin/saslauthd
 Provides:       cyrus-sasl2:/usr/sbin/saslauthd
 Summary:        The SASL Authentication Server
 Version:        2.1.23
-Release:        2
+Release:        3
 Source:         cyrus-sasl-%{version}.tar.bz2
 Source1:        cyrus-sasl-rc.tar.bz2
 Patch:          cyrus-sasl.dif
@@ -50,7 +50,7 @@ Authors:
     <tech-transfer> tech-transfer@andrew.cmu.edu
 
 %package -n     cyrus-sasl-ldap-auxprop
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Summary:        The cyrus-sasl LDAP auxprop plugin
 AutoReqProv:    on
 Group:          Productivity/Networking/Other
@@ -67,7 +67,7 @@ Authors:
     <tech-transfer> tech-transfer@andrew.cmu.edu
 
 %package -n     cyrus-sasl-sqlauxprop
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Summary:        cyrus-sasl SQL auxprop plugin
 AutoReqProv:    on
 Group:          Development/Libraries/C and C++
diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes
index a0d5961..3ca4bcf 100644
--- a/cyrus-sasl.changes
+++ b/cyrus-sasl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 23 10:57:47 UTC 2009 - rhafer@novell.com
+
+- Fixed linker arguments for ldap- and sql-auxprop plugins 
+  (bnc#555568)
+
 -------------------------------------------------------------------
 Mon Jul 20 16:20:35 CEST 2009 - coolo@novell.com
 
diff --git a/cyrus-sasl.dif b/cyrus-sasl.dif
index d16f610..fc0224f 100644
--- a/cyrus-sasl.dif
+++ b/cyrus-sasl.dif
@@ -65,7 +65,7 @@ Index: plugins/Makefile.am
  
  COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
  
-@@ -82,73 +69,59 @@ EXTRA_LTLIBRARIES = libplain.la libanony
+@@ -82,73 +69,61 @@ EXTRA_LTLIBRARIES = libplain.la libanony
  	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
  
  libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
@@ -131,11 +131,13 @@ Index: plugins/Makefile.am
  
  libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
 -libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
++libldapdb_la_LDFLAGS = $(LIB_LDAP) $(AM_LDFLAGS)
  libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
  libldapdb_la_LIBADD = $(COMPAT_OBJS)
  
  libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
 -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
++libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(AM_LDFLAGS)
  libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
  libsql_la_LIBADD = $(COMPAT_OBJS)
  
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 4e1e8d3..5a31316 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -20,11 +20,11 @@
 
 Name:           cyrus-sasl
 Version:        2.1.23
-Release:        2
+Release:        3
 BuildRequires:  db-devel krb5-mini-devel openssl-devel opie pam-devel
 Obsoletes:      cyrus-sasl2 <= %{version}
 Provides:       cyrus-sasl2 = %{version}
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Group:          Productivity/Networking/Other
 Url:            http://asg.web.cmu.edu/sasl/
 AutoReqProv:    on
@@ -47,7 +47,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 
 %package      gssapi
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Obsoletes:      cyrus-sasl2-gssapi <= %{version}
 Provides:       cyrus-sasl2-gssapi = %{version}
 Summary:        cyrus-sasl plugin for the GSSAPI mechanism
@@ -57,7 +57,7 @@ Requires:       cyrus-sasl
 #
 
 %package      crammd5
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the CRAMMD5 mechanism
 AutoReqProv:    on
 Group:          Development/Libraries/C and C++
@@ -69,7 +69,7 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libcrammd5.so
 #
 
 %package      digestmd5
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the DIGESTMD5 mechanism
 AutoReqProv:    on
 Group:          Development/Libraries/C and C++
@@ -81,7 +81,7 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libdigestmd5.so
 #
 
 %package      otp
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the OTP mechanism
 AutoReqProv:    on
 Group:          Development/Libraries/C and C++
@@ -93,7 +93,7 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libotp.so
 #
 
 %package      plain
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Summary:        cyrus-sasl plugin for the PLAIN mechanism
 AutoReqProv:    on
 Group:          Development/Libraries/C and C++
@@ -105,7 +105,7 @@ Provides:       cyrus-sasl2:%{_libdir}/sasl2/libplain.so
 #
 
 %package      ntlm
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Summary:        Implementation of Cyrus SASL API
 AutoReqProv:    on
 Group:          Productivity/Networking/Other
@@ -113,7 +113,7 @@ Requires:       cyrus-sasl
 #
 
 %package      devel
-License:        BSD 4-clause (or similar)
+License:        BSD4c(or similar)
 Obsoletes:      cyrus-sasl2-devel <= %{version}
 Provides:       cyrus-sasl2-devel = %{version}
 # bug437293