diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index da54fef7cb..4e9571416f 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-05  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
+
+	* QDocument.C: use geometry on custom, A3, B3 and B4
+	papersizes.
+
 2003-12-05  Angus Leeming  <leeming@lyx.org>
 
 	* QVCLog.[Ch]:
diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index cefd5ce5dd..af27a2c706 100644
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -337,6 +337,10 @@ void QDocument::apply()
 	params.papersize2 = VMARGIN_PAPER_TYPE(
 		dialog_->pageLayoutModule->papersizeCO->currentItem());
 
+	// custom, A3, B3 and B4 paper sizes need geometry
+	int psize = dialog_->pageLayoutModule->papersizeCO->currentItem();
+	bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
+
 	params.paperwidth = widgetsToLength(dialog_->pageLayoutModule->paperwidthLE,
 		dialog_->pageLayoutModule->paperwidthUnitCO);
 
@@ -355,7 +359,8 @@ void QDocument::apply()
 
 	// margins
 	params.use_geometry =
-		(dialog_->marginsModule->marginCO->currentItem() == 1);
+		(dialog_->marginsModule->marginCO->currentItem() == 1
+		|| geom_papersize);
 
 	int margin = dialog_->marginsModule->marginCO->currentItem();
 	if (margin > 0) {