diff --git a/configure.ac b/configure.ac
index d0d0717df53d7ea540030141f586ec62ad0bb1b1..e9e8fd76b3db469c5ac89054eec61f5f795e9af7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,9 @@ AC_SUBST(sflphone_datadir)
 
 AC_SUBST(LIB_DNSSD)
 AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")	
-LIBS="$LIBS -lstdc++ $LIB_QT"
+LIBS="$LIBS -lstdc++"
+
+AC_SUBST(LIB_QT)
 
 dnl AC_CONFIG_FILES(
 AC_OUTPUT(
diff --git a/libs/taxidermy/Makefile.am b/libs/taxidermy/Makefile.am
index a395be5eef4890e7cb4a970ed482d40df5b343f7..191e7828e57b4989f363ef2540a5509233279d7d 100644
--- a/libs/taxidermy/Makefile.am
+++ b/libs/taxidermy/Makefile.am
@@ -5,9 +5,9 @@ BUILT_SOURCES = \
            Huntermoc.cpp \
            PaintEventFiltermoc.cpp \
            QButtonBuildermoc.cpp \
-           WidgetBuilderCreatormoc.cpp WidgetBuilderCreator.inl \
+           WidgetBuilderCreatormoc.cpp \
            WidgetBuilderFactorymoc.cpp \
-           WidgetBuilderFactoryImplmoc.cpp WidgetBuilderFactoryImpl.inl \
+           WidgetBuilderFactoryImplmoc.cpp \
            WidgetBuildermoc.cpp 
 
 
@@ -44,6 +44,7 @@ CLEANFILES = \
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 AM_CPPFLAGS = -I$(top_srcdir)/libs/ $(QT_INCLUDES) $(X_INCLUDES) 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) 
+AM_LDADD = $(LIB_QT)
 
 
 
diff --git a/src/gui/qt/Makefile.am b/src/gui/qt/Makefile.am
index 5f62ad22707658d88b219d8cdccdf8b5db2735c5..5a58896af90b477ea6ddfd4f2bdb059d77992900 100644
--- a/src/gui/qt/Makefile.am
+++ b/src/gui/qt/Makefile.am
@@ -113,8 +113,7 @@ CLEANFILES = \
 	$(BUILT_SOURCES)
 
 sflphone_qt_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DDATADIR=\"$(datadir)\"
-sflphone_qt_LIBS = $(LIB_QT) 
-sflphone_qt_LDADD = $(top_srcdir)/libs/taxidermy/libtaxidermy.la
+sflphone_qt_LDADD = $(LIB_QT) $(top_srcdir)/libs/taxidermy/libtaxidermy.la
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 AM_CPPFLAGS = -I$(top_srcdir)/libs/ $(KDE_INCLUDES) $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)