diff --git a/ChangeLog b/ChangeLog
index 46814f818e..4f60aaa94d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-02-21  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* src/frontends/xforms/FormDocument.C (checkMarginValues):
+ 	Activate "use geometry" button if using custom paper size/margin.
+
+2001-01-24  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* lib/configure.m4: Add a check for dvipdfm
+
+2001-01-23  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* src/buffer.C:
+	* src/tex-strings.C: Add support for ae fonts
+
 2001-11-23  Panayotis "PAP" Papasotiriou  <papasot@physics.upatras.gr>
 
 	* lib/templates/kluwer.lyx: 
diff --git a/lib/configure b/lib/configure
index 40aa44d3d4..a7c567b32f 100755
--- a/lib/configure
+++ b/lib/configure
@@ -666,6 +666,43 @@ fi
 
 test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$o \$\$i"
 
+# Search for a program to convert dvi to pdf
+echo $ac_n "checking for a DVI to PDF converter""... $ac_c"
+echo "$ac_t""(dvipdfm)"
+dvi_to_pdf_command=
+for ac_prog in dvipdfm
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog ; ac_word=$2
+if test -n "$ac_word"; then
+  echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -x $ac_dir/$ac_word; then
+      dvi_to_pdf_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$dvi_to_pdf_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$dvi_to_pdf_command" && break
+fi
+done
+
+if test -z "$dvi_to_pdf_command" ; then
+  dvi_to_pdf_command=none
+fi
+
+test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
+
 # Search a *roff program (used to translate tables in ASCII export)
 echo $ac_n "checking for a *roff formatter""... $ac_c"
 echo "$ac_t""(groff nroff)"
@@ -1106,6 +1143,7 @@ cat >lyxrc.defaults <<EOF
 \\Format literate nw	NoWeb		N
 \\Format pdf	  pdf	PDF		P
 \\Format pdf2	  pdf  "PDF (pdflatex)"	F
+\\Format pdf3	  pdf  "PDF (dvipdfm)"	m
 \\Format png	  png	PNG		""
 \\Format ps	  ps	Postscript	t
 \\Format program  ""	Program		""
@@ -1116,6 +1154,7 @@ cat >lyxrc.defaults <<EOF
 \\converter latex pdf2 "$PDFLATEX \$\$i" "latex"
 \\converter latex html "$latex_to_html_command" "originaldir,needaux"
 \\converter literate latex "$literate_to_tex_command" ""
+\\converter dvi pdf3 "$dvi_to_pdf_command" ""
 \\converter dvi ps "$dvi_to_ps_command" ""
 \\converter ps pdf "$ps_to_pdf_command" ""
 \\converter ps fax "$fax_command" ""
diff --git a/lib/configure.m4 b/lib/configure.m4
index 1e564869ef..10913e9d57 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -232,6 +232,10 @@ test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf \$\$i"
 SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command,dvips)
 test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$o \$\$i"
 
+# Search for a program to convert dvi to pdf
+SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command,dvipdfm)
+test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
+
 # Search a *roff program (used to translate tables in ASCII export)
 SEARCH_PROG([for a *roff formatter],ROFF,groff nroff)
 ascii_roff_command=$ROFF
@@ -407,6 +411,7 @@ cat >lyxrc.defaults <<EOF
 \\Format literate nw	NoWeb		N
 \\Format pdf	  pdf	PDF		P
 \\Format pdf2	  pdf  "PDF (pdflatex)"	F
+\\Format pdf3	  pdf  "PDF (dvipdfm)"	m
 \\Format png	  png	PNG		""
 \\Format ps	  ps	Postscript	t
 \\Format program  ""	Program		""
@@ -417,6 +422,7 @@ cat >lyxrc.defaults <<EOF
 \\converter latex pdf2 "$PDFLATEX \$\$i" "latex"
 \\converter latex html "$latex_to_html_command" "originaldir,needaux"
 \\converter literate latex "$literate_to_tex_command" ""
+\\converter dvi pdf3 "$dvi_to_pdf_command" ""
 \\converter dvi ps "$dvi_to_ps_command" ""
 \\converter ps pdf "$ps_to_pdf_command" ""
 \\converter ps fax "$fax_command" ""
diff --git a/src/buffer.C b/src/buffer.C
index 6a0982a03d..86599ed19e 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1776,9 +1776,15 @@ void Buffer::makeLaTeXFile(string const & fname,
 		// end of \documentclass defs
 		
 		// font selection must be done before loading fontenc.sty
-		if (params.fonts != "default") {
+		// The ae package is not needed when using OT1 font encoding.
+		if (params.fonts != "default" &&
+		    (params.fonts != "ae" || lyxrc.fontenc != "default")) {
 			ofs << "\\usepackage{" << params.fonts << "}\n";
 			texrow.newline();
+			if (params.fonts == "ae") {
+				ofs << "\\usepackage{aecompl}\n";
+				texrow.newline();
+			}
 		}
 		// this one is not per buffer
 		if (lyxrc.fontenc != "default") {
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 06bdddf594..c4947c7dff 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -835,19 +835,18 @@ void FormDocument::checkReadOnly()
 
 void FormDocument::checkMarginValues()
 {
-#if 0
-    int const allEmpty = (!strlen(fl_get_input(paper_->input_top_margin)) &&
-		!strlen(fl_get_input(paper_->input_bottom_margin)) &&
-		!strlen(fl_get_input(paper_->input_left_margin)) &&
-		!strlen(fl_get_input(paper_->input_right_margin)) &&
-		!strlen(fl_get_input(paper_->input_head_height)) &&
-		!strlen(fl_get_input(paper_->input_head_sep)) &&
-		!strlen(fl_get_input(paper_->input_foot_skip)) &&
-		!strlen(fl_get_input(paper_->input_custom_width)) &&
-		!strlen(fl_get_input(paper_->input_custom_height)));
-    if (!allEmpty)
-	fl_set_button(paper_->push_use_geometry, 1);
-#endif
+	bool const not_empty =
+		strlen(fl_get_input(paper_->input_top_margin)) ||
+		strlen(fl_get_input(paper_->input_bottom_margin)) ||
+		strlen(fl_get_input(paper_->input_left_margin)) ||
+		strlen(fl_get_input(paper_->input_right_margin)) ||
+		strlen(fl_get_input(paper_->input_head_height)) ||
+		strlen(fl_get_input(paper_->input_head_sep)) ||
+		strlen(fl_get_input(paper_->input_foot_skip)) ||
+		strlen(fl_get_input(paper_->input_custom_width)) ||
+		strlen(fl_get_input(paper_->input_custom_height));
+	if (not_empty)
+		fl_set_button(paper_->push_use_geometry, 1);
 }
 
 
diff --git a/src/tex-strings.C b/src/tex-strings.C
index 1cb06a37c0..89bb92dd2f 100644
--- a/src/tex-strings.C
+++ b/src/tex-strings.C
@@ -62,7 +62,7 @@ char const * tex_graphics[] = {"default", "dvips", "dvitops", "emtex",
 		      "ln", "oztex", "textures", "none", ""};
 
 
-char const * tex_fonts[] = {"default", "pslatex", "times", "palatino",
+char const * tex_fonts[] = {"default", "ae", "pslatex", "times", "palatino",
 			    "helvet", "avant", "newcent", "bookman", ""};