diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index a4d96ae..2b88448 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -20,10 +20,10 @@
 
 Name:           openssh-askpass-gnome
 BuildRequires:  gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-devel tcpd-devel update-desktop-files
-License:        BSD 3-Clause
+License:        BSD 3-clause (or similar)
 Group:          Productivity/Networking/SSH
 Version:        5.2p1
-Release:        3
+Release:        4
 Requires:       openssh = %{version} openssh-askpass = %{version}
 AutoReqProv:    on
 Summary:        A GNOME-Based Passphrase Dialog for OpenSSH
diff --git a/openssh.changes b/openssh.changes
index d26c964..7200d1d 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 19 10:35:46 CEST 2009 - coolo@novell.com
+
+- disable as-needed for this package as it fails to build with it
+
 -------------------------------------------------------------------
 Tue May 26 11:56:20 CEST 2009 - anicka@suse.cz
 
diff --git a/openssh.spec b/openssh.spec
index 36090f3..f00c0fc 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -29,7 +29,7 @@ Name:           openssh
 %endif
 BuildRequires:  audit-devel krb5-devel opensc-devel openssl-devel pam-devel tcpd-devel xorg-x11-devel
 BuildRequires:  libselinux-devel
-License:        BSD 3-Clause; X11/MIT
+License:        BSD 3-clause (or similar) ; MIT License (or similar)
 Group:          Productivity/Networking/SSH
 Obsoletes:      ssh
 Provides:       ssh
@@ -38,7 +38,7 @@ PreReq:         /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq  %fillup_pr
 Conflicts:      nonfreessh
 AutoReqProv:    on
 Version:        5.2p1
-Release:        3
+Release:        4
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 Url:            http://www.openssh.com/
@@ -74,7 +74,7 @@ Patch48:        %{name}-%{version}-forwards.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package      askpass
-License:        BSD 3-Clause; X11/MIT
+License:        BSD 3-clause (or similar) ; MIT License (or similar)
 Summary:        A passphrase dialog for OpenSSH and the X Window System
 Requires:       openssh = %{version}
 Provides:       openssh:/usr/%_lib/ssh/ssh-askpass
@@ -168,6 +168,9 @@ cd ../x11-ssh-askpass-%{xversion}
 %patch12
 
 %build
+# This package failed when testing with -Wl,-as-needed being default.
+# So we disable it here, if you want to retest, just delete this comment and the line below.
+export SUSE_ASNEEDED=0
 %if "%{_prefix}" != "/usr/X11R6"
   for i in configure.ac Makefile.in pathnames.h ssh_config.0 ssh_config.5 sshd_config.0 sshd_config.5 ; do 
     sed -i -e 's@%{_prefix}@/usr@g' $i
@@ -305,6 +308,8 @@ rm -rf $RPM_BUILD_ROOT
 %_appdefdir/SshAskpass
 
 %changelog
+* Fri Jun 19 2009 coolo@novell.com
+- disable as-needed for this package as it fails to build with it
 * Tue May 26 2009 anicka@suse.cz
 - disable -f in startproc to calm the warning (bnc#506831)
 * Thu Apr 23 2009 lnussel@suse.de