diff --git a/src/gui_w32.c b/src/gui_w32.c
index b35c8ab..c5bd81d 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1661,7 +1661,7 @@
 	    return FAIL;
     }
     s_textArea = CreateWindowEx(
-	WS_EX_CLIENTEDGE,
+	0,
 	szTextAreaClass, "Vim text area",
 	WS_CHILD | WS_VISIBLE, 0, 0,
 	100,				/* Any value will do for now */
@@ -1716,9 +1716,9 @@
     highlight_gui_started();
 
     /*
-     * Start out by adding the configured border width into the border offset
+     * Start out by adding the configured border width into the border offset.
      */
-    gui.border_offset = gui.border_width + 2;	/*CLIENT EDGE*/
+    gui.border_offset = gui.border_width;
 
     /*
      * Set up for Intellimouse processing
diff --git a/src/version.c b/src/version.c
index fc286b8..a518d86 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    930,
+/**/
     929,
 /**/
     928,