diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 919637839f..7d75cf993e 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-19  Edwin Leuven  <leuven@fee.uva.nl>
+
+	* qt2 compiles again:
+	* Makefile.am: added missing xform dialogs
+	* FormParagraph.C: only extra setting if wanted
+	* FormParagraph.h: add namespace to connection
+	
 2001-03-16  Kalle Dalheimer  <kalle@klaralvdalens-datakonsult.se>
 
 	* FormParagraph.C (apply): Only call SetParagraphExtraOpt() when
diff --git a/src/frontends/qt2/FormParagraph.C b/src/frontends/qt2/FormParagraph.C
index 0c0d5bb0ad..bf5a2c51f0 100644
--- a/src/frontends/qt2/FormParagraph.C
+++ b/src/frontends/qt2/FormParagraph.C
@@ -148,6 +148,7 @@ void FormParagraph::apply()
 		spaceabove, spacebelow, dialog_->getAlign(),
 		dialog_->getLabelWidth(), dialog_->getNoIndent());
 
+#ifndef NO_PEXTRA
 	// extra stuff
 
 	string width("");
@@ -167,7 +168,7 @@ void FormParagraph::apply()
 		dialog_->getExtraAlign(),
 		dialog_->getHfillBetween(),
 		dialog_->getStartNewMinipage());
-
+#endif
 	lv_->view()->update(lv_->view()->text,
 			    BufferView::SELECT |
 			    BufferView::FITCUR |
diff --git a/src/frontends/qt2/FormParagraph.h b/src/frontends/qt2/FormParagraph.h
index 8c061b80cf..fa13d2e879 100644
--- a/src/frontends/qt2/FormParagraph.h
+++ b/src/frontends/qt2/FormParagraph.h
@@ -50,7 +50,7 @@ private:
 	Dialogs * d_;
 	
 	/// Hide connection.
-	Connection h_;
+   SigC::Connection h_;
 	
 	/// readonly file or not
 	bool readonly; 
diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 8f5cf534c0..4e3b55ecfa 100644
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -30,34 +30,52 @@ LYXDATADIRS = dlg
 DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 
 libqt2_la_OBJADD = \
-	../xforms/ButtonController.lo \
+	../controllers/ButtonController.lo \
+	../xforms/combox.lo \
 	../xforms/Color.lo \
 	../xforms/FormBase.lo \
 	../xforms/FormBaseDeprecated.lo	\
+	../xforms/FormBibitem.lo \
+	../xforms/FormBibtex.lo \
+	../xforms/FormBrowser.lo \
 	../xforms/FormCopyright.lo	\
 	../xforms/FormCredits.lo \
 	../xforms/FormDocument.lo \
 	../xforms/FormError.lo \
+	../xforms/FormExternal.lo \
 	../xforms/FormGraphics.lo \
+	../xforms/FormInclude.lo \
 	../xforms/FormIndex.lo \
 	../xforms/FormInset.lo \
+	../xforms/FormLog.lo \
+	../xforms/FormMinipage.lo \
+	../xforms/FormMaths.lo \
 	../xforms/FormPreamble.lo \
 	../xforms/FormPreferences.lo \
 	../xforms/FormRef.lo \
 	../xforms/FormTabular.lo \
 	../xforms/FormToc.lo \
 	../xforms/FormUrl.lo \
+	../xforms/FormVCLog.lo \
+	../xforms/MathsSymbols.lo \
 	../xforms/Menubar_pimpl.lo \
 	../xforms/RadioButtonGroup.lo \
-	../xforms/Toolbar_pimpl.lo \
 	../xforms/Timeout_pimpl.lo \
-	../xforms/form_citation.lo \
+	../xforms/Toolbar_pimpl.lo \
+	../xforms/bmtable.lo \
+	../xforms/form_bibitem.lo \
+	../xforms/form_bibtex.lo \
+	../xforms/form_browser.lo \
 	../xforms/form_credits.lo \
-	../xforms/form_copyright.lo \
 	../xforms/form_document.lo \
 	../xforms/form_error.lo \
+	../xforms/form_external.lo \
 	../xforms/form_index.lo \
 	../xforms/form_graphics.lo \
+	../xforms/form_include.lo \
+	../xforms/form_index.lo \
+	../xforms/form_maths.lo \
+	../xforms/form_minipage.lo \
 	../xforms/form_preamble.lo \
 	../xforms/form_preferences.lo \
 	../xforms/form_ref.lo \
@@ -65,8 +83,8 @@ libqt2_la_OBJADD = \
 	../xforms/form_toc.lo \
 	../xforms/form_url.lo \
 	../xforms/input_validators.lo \
-	../xforms/xforms_helpers.lo	\
-	../xforms/xformsBC.lo
+	../xforms/xformsBC.lo \
+	../xforms/xforms_helpers.lo
 
 LIBS=
 LDFLAGS= $(libqt2_la_OBJADD)