diff --git a/configure.in b/configure.in
index 1e88d2ff7b..0b3cb7544e 100644
--- a/configure.in
+++ b/configure.in
@@ -186,8 +186,9 @@ dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
 case "$lyx_use_frontend" in 
   xforms) 
   # for now don't set it for xforms as this is always entered
-    FRONTEND=""
-    FRONTEND_GUILIB="xforms/libxforms.o";;
+    FRONTEND="xforms"
+    FRONTEND_GUILIB="xforms/*.lo"
+    FRONTEND_INCLUDES="-I\$(srcdir)/xforms";;
   gnome)    
     AM_PATH_GTKMM(1.2.1,,
         AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
@@ -205,15 +206,15 @@ dnl Ensure gnome-config is available...
 	    AC_MSG_ERROR(Did not find libGlade installed)
 	fi
 		
-    FRONTEND="gnome"
-    FRONTEND_GUILIB="gnome/libgnome.la"
+    FRONTEND="xforms gnome"
+    FRONTEND_GUILIB="gnome/*.lo"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
     FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
     FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
   qt2)
     QT2_DO_IT_ALL
-    FRONTEND="qt2"
-    FRONTEND_GUILIB="qt2/libqt2.la"
+    FRONTEND="xforms qt2"
+    FRONTEND_GUILIB="qt2/*.lo"
     FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
     FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
     FRONTEND_LIBS="\$(QT2_LIBS)";;
diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index ee31fca568..c34d6260f4 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -4,20 +4,17 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 # xforms has to be fixed here as we still need object files in this directory
 # for the compilation of other frontends, so until that we have to let this
 # here.
-SUBDIRS = controllers xforms @FRONTEND@
+SUBDIRS = controllers @FRONTEND@
 ETAGS_ARGS = --lang=c++
 BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = ${FRONTEND_INCLUDES} -I${srcdir}/.. -I${srcdir}/xforms ${SIGC_CFLAGS} $(BOOST_INCLUDES)
+INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/..  $(SIGC_CFLAGS) $(BOOST_INCLUDES)
 LIBS =
 noinst_LTLIBRARIES = libfrontends.la
 
-libfrontends_la_LIBADD= \
-	xforms/*.lo \
+libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \
 	controllers/*.lo
 
-libfrontends_la_DEPENDENCIES = \
-	xforms/*.lo \
-	controllers/*.lo
+libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD)
 
 libfrontends_la_SOURCES=\
 	Alert.C \
@@ -42,7 +39,7 @@ libfrontends.la: libfrontends.o
 libfrontends.o: $(libfrontends_la_OBJECTS) $(libfrontends_la_DEPENDENCIES)
 	$(CXXLINK) $(libfrontends_la_OBJECTS) $(libfrontends_la_LIBADD)
 
-EXTRA_DIST = qt2 gnome
+EXTRA_DIST = xforms qt2 gnome
 
 dist-hook:
 	@cd $(distdir) ; \