diff --git a/src/gui_w48.c b/src/gui_w48.c
index 123584b..40af60f 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -1084,9 +1084,15 @@
 	case WM_NOTIFY: Handle_WM_Notify(hwnd, (LPNMHDR)lParam);
 	    return TRUE;
 #endif
+	/* Workaround for the problem that MyWindowProc() returns FALSE on 64
+	 * bit windows when cross-compiled using Mingw libraries. (Andy
+	 * Kittner) */
+	case WM_NCCREATE:
+	    MyWindowProc(hwnd, uMsg, wParam, lParam);
+	    return TRUE;
 
-    default:
-	return MyWindowProc(hwnd, uMsg, wParam, lParam);
+	default:
+	    return MyWindowProc(hwnd, uMsg, wParam, lParam);
     }
 }
 
diff --git a/src/version.c b/src/version.c
index a2bc904..a823253 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    352,
+/**/
     351,
 /**/
     350,