diff --git a/src/ChangeLog b/src/ChangeLog
index 94e8a20fb8b..4925c749101 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xfns.c (Fx_create_frame, x_create_tip_frame): Set default border width
+	to zero.
+
 2010-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* term.c (init_tty): Move common text outside of #ifdef TERMINFO.
diff --git a/src/xfns.c b/src/xfns.c
index ea88c840d54..d19914e8dec 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3376,7 +3376,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
 
   /* Frame contents get displaced if an embedded X window has a border.  */
   if (! FRAME_X_EMBEDDED_P (f))
-    x_default_parameter (f, parms, Qborder_width, make_number (2),
+    x_default_parameter (f, parms, Qborder_width, make_number (0),
 			 "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
 
   /* This defaults to 1 in order to match xterm.  We recognize either
@@ -4847,7 +4847,7 @@ x_create_tip_frame (dpyinfo, parms, text)
      needed to determine window geometry.  */
   x_default_font_parameter (f, parms);
 
-  x_default_parameter (f, parms, Qborder_width, make_number (2),
+  x_default_parameter (f, parms, Qborder_width, make_number (0),
 		       "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
 
   /* This defaults to 2 in order to match xterm.  We recognize either