diff --git a/src/gui_w32.c b/src/gui_w32.c
index cdb1abb..128869e 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1575,7 +1575,7 @@
 
 #ifdef FEAT_EVAL
     /* set the v:windowid variable */
-    set_vim_var_nr(VV_WINDOWID, (long)s_hwnd);
+    set_vim_var_nr(VV_WINDOWID, HandleToLong(s_hwnd));
 #endif
 
 theend:
diff --git a/src/version.c b/src/version.c
index 14c2b85..65de7c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    206,
+/**/
     205,
 /**/
     204,