diff --git a/src/ChangeLog b/src/ChangeLog
index cdc723226842e801cda46676305e9f195ee6f444..6aa252fcf92f9029c4a7f4f90ad42c2946ccd364 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-29  Chong Yidong  <cyd@stupidchicken.com>
+
+	* frame.c (DEFAULT_ROWS): Change default to 35.
+
+	* xfns.c (x_default_font_parameter): Change default XFT font to
+	monospace-10 (Bug#3643).
+
 2010-01-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32inevt.c (key_event): Remove unnecessary comparison of
diff --git a/src/frame.c b/src/frame.c
index 631cc6b06b31bba118bee38da697f9773fd6efbe..f05f9f751da3c1dfbc5fd7f79508ce62d75982eb 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4191,7 +4191,7 @@ On Nextstep, this just calls `ns-parse-geometry'.  */)
 
    This function does not make the coordinates positive.  */
 
-#define DEFAULT_ROWS 40
+#define DEFAULT_ROWS 35
 #define DEFAULT_COLS 80
 
 int
diff --git a/src/xfns.c b/src/xfns.c
index 0ebce8d1e246b51374ccc0dae7c59421bc3dd7eb..96fb090e32768c16eb4ea21e3b566f2d2794a576 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3089,7 +3089,7 @@ x_default_font_parameter (f, parms)
 	= {
 #ifdef HAVE_XFT
 	    /* This will find the normal Xft font.  */
- 	    "monospace-12",
+ 	    "monospace-10",
 #endif
 	    "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1",
 	    "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1",