diff --git a/autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch b/autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch
new file mode 100644
index 0000000..42090b6
--- /dev/null
+++ b/autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch
@@ -0,0 +1,37 @@
+--- m4/ax_have_qt.m4.orig	2010-10-26 00:00:00.000000000 +0200
++++ m4/ax_have_qt.m4	2011-03-23 14:53:45.959051749 +0100
+@@ -101,20 +101,24 @@ AC_DEFUN([AX_HAVE_QT],
+   AC_MSG_CHECKING(for Qt)
+ 
+   AC_ARG_WITH([Qt-dir],
+-    [  --with-Qt-dir=DIR       DIR is equal to $QTDIR if you have followed the
+-                          installation instructions of Trolltech. Header
+-                          files are in DIR/include, binary utilities are
+-                          in DIR/bin. The library is in DIR/lib, unless
+-			  --with-Qt-lib-dir is also set.])
++              AS_HELP_STRING([--with-Qt-dir=DIR],
++                             [DIR is equal to $QTDIR if you have followed the
++                              installation instructions of Trolltech. Header
++                              files are in DIR/include, binary utilities are
++                              in DIR/bin. The library is in DIR/lib, unless
++                              --with-Qt-lib-dir is also set.]))
+   AC_ARG_WITH([Qt-include-dir],
+-    [  --with-Qt-include-dir=DIR
+-                          Qt header files are in DIR])
++              AS_HELP_STRING([--with-Qt-include-dir=DIR],
++                             [Qt header files are in DIR]))
+   AC_ARG_WITH([Qt-bin-dir],
+-    [  --with-Qt-bin-dir=DIR   Qt utilities such as moc and uic are in DIR])
++              AS_HELP_STRING([--with-Qt-bin-dir=DIR],
++                             [Qt utilities such as moc and uic are in DIR]))
+   AC_ARG_WITH([Qt-lib-dir],
+-    [  --with-Qt-lib-dir=DIR   The Qt library is in DIR])
++              AS_HELP_STRING([--with-Qt-lib-dir=DIR],
++                             [The Qt library is in DIR]))
+   AC_ARG_WITH([Qt-lib],
+-    [  --with-Qt-lib=LIB       Use -lLIB to link with the Qt library])
++              AS_HELP_STRING([--with-Qt-lib=LIB],
++                             [Use -lLIB to link with the Qt library]))
+   if test x"$with_Qt_dir" = x"no" ||
+      test x"$with_Qt_include-dir" = x"no" ||
+      test x"$with_Qt_bin_dir" = x"no" ||
diff --git a/autoconf-archive-ax_have_qt_fix_library_order.patch b/autoconf-archive-ax_have_qt_fix_library_order.patch
new file mode 100644
index 0000000..a331dec
--- /dev/null
+++ b/autoconf-archive-ax_have_qt_fix_library_order.patch
@@ -0,0 +1,13 @@
+Index: m4/ax_have_qt.m4
+===================================================================
+--- m4/ax_have_qt.m4.orig	2011-03-23 17:27:33.000000000 +0100
++++ m4/ax_have_qt.m4	2011-03-23 17:29:07.105463016 +0100
+@@ -313,7 +313,7 @@ EOF
+             echo "configure: could not compile:" >&AC_FD_CC
+             cat ax_qt_main.$ac_ext >&AC_FD_CC
+           else
+-            ax_try_4="$CXX $QT_LIBS $LIBS -o ax_qt_main ax_qt_main.o moc_ax_qt_test.o >/dev/null 2>/dev/null"
++            ax_try_4="$CXX -o ax_qt_main ax_qt_main.o moc_ax_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null"
+             AC_TRY_EVAL(ax_try_4)
+             if test x"$ac_status" != x0; then
+               echo "$ax_err_4" >&AC_FD_CC
diff --git a/autoconf-archive-fix_AX_HAVE_QT.patch b/autoconf-archive-fix_AX_HAVE_QT.patch
index d36b7bb..b05f0d7 100644
--- a/autoconf-archive-fix_AX_HAVE_QT.patch
+++ b/autoconf-archive-fix_AX_HAVE_QT.patch
@@ -6,44 +6,9 @@ signed-off-by: pth@suse.de
 
 Index: m4/ax_have_qt.m4
 ===================================================================
---- m4/ax_have_qt.m4.orig	2010-10-26 00:00:00.000000000 +0200
-+++ m4/ax_have_qt.m4	2011-03-23 14:53:45.959051749 +0100
-@@ -101,20 +101,24 @@ AC_DEFUN([AX_HAVE_QT],
-   AC_MSG_CHECKING(for Qt)
- 
-   AC_ARG_WITH([Qt-dir],
--    [  --with-Qt-dir=DIR       DIR is equal to $QTDIR if you have followed the
--                          installation instructions of Trolltech. Header
--                          files are in DIR/include, binary utilities are
--                          in DIR/bin. The library is in DIR/lib, unless
--			  --with-Qt-lib-dir is also set.])
-+              AS_HELP_STRING([--with-Qt-dir=DIR],
-+                             [DIR is equal to $QTDIR if you have followed the
-+                              installation instructions of Trolltech. Header
-+                              files are in DIR/include, binary utilities are
-+                              in DIR/bin. The library is in DIR/lib, unless
-+                              --with-Qt-lib-dir is also set.]))
-   AC_ARG_WITH([Qt-include-dir],
--    [  --with-Qt-include-dir=DIR
--                          Qt header files are in DIR])
-+              AS_HELP_STRING([--with-Qt-include-dir=DIR],
-+                             [Qt header files are in DIR]))
-   AC_ARG_WITH([Qt-bin-dir],
--    [  --with-Qt-bin-dir=DIR   Qt utilities such as moc and uic are in DIR])
-+              AS_HELP_STRING([--with-Qt-bin-dir=DIR],
-+                             [Qt utilities such as moc and uic are in DIR]))
-   AC_ARG_WITH([Qt-lib-dir],
--    [  --with-Qt-lib-dir=DIR   The Qt library is in DIR])
-+              AS_HELP_STRING([--with-Qt-lib-dir=DIR],
-+                             [The Qt library is in DIR]))
-   AC_ARG_WITH([Qt-lib],
--    [  --with-Qt-lib=LIB       Use -lLIB to link with the Qt library])
-+              AS_HELP_STRING([--with-Qt-lib=LIB],
-+                             [Use -lLIB to link with the Qt library]))
-   if test x"$with_Qt_dir" = x"no" ||
-      test x"$with_Qt_include-dir" = x"no" ||
-      test x"$with_Qt_bin_dir" = x"no" ||
-@@ -494,7 +498,6 @@ AC_DEFUN([AX_PATH_QT_DIRECT],
+--- m4/ax_have_qt.m4.orig	2011-03-23 17:27:18.041890363 +0100
++++ m4/ax_have_qt.m4	2011-03-23 17:27:29.844575610 +0100
+@@ -498,7 +498,6 @@ AC_DEFUN([AX_PATH_QT_DIRECT],
                # We can link with no special library directory.
                ax_qt_lib_dir=
              ], [
diff --git a/autoconf-archiv-no_semicolon.patch b/autoconf-archive-no_semicolon.patch
similarity index 100%
rename from autoconf-archiv-no_semicolon.patch
rename to autoconf-archive-no_semicolon.patch
diff --git a/autoconf-archive.changes b/autoconf-archive.changes
index 2921964..d439ca4 100644
--- a/autoconf-archive.changes
+++ b/autoconf-archive.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 25 14:17:05 CET 2011 - pth@suse.de
+
+- Libraries come last, not first in call to linker. Otherwise
+  linking fails when as-needed is in effect.
+
 -------------------------------------------------------------------
 Wed Mar 23 14:56:40 CET 2011 - pth@suse.de
 
diff --git a/autoconf-archive.spec b/autoconf-archive.spec
index bb3394c..161eb72 100644
--- a/autoconf-archive.spec
+++ b/autoconf-archive.spec
@@ -26,8 +26,10 @@ License:        GPL
 Group:          Development/Tools/Building
 Source0:        %{name}-%{version}.tar.xz
 Patch0:         autoconf-archive-boost_lib64.patch
-Patch1:         autoconf-archive-fix_AX_HAVE_QT.patch
-Patch2:         autoconf-archiv-no_semicolon.patch
+Patch1:         autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch
+Patch2:         autoconf-archive-fix_AX_HAVE_QT.patch
+Patch3:         autoconf-archive-no_semicolon.patch
+Patch4:         autoconf-archive-ax_have_qt_fix_library_order.patch
 Url:            http://savannah.gnu.org/projects/autoconf-archive
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  xz
@@ -55,6 +57,8 @@ some authors may choose to use it, too, for proprietary software.
 %patch0
 %patch1
 %patch2
+%patch3
+%patch4
 
 %build
 %configure