diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index d2463f4..f21f4c3 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -62,6 +62,10 @@
 endfunc
 
 func Test_help_arg()
+  if !has('unix') && has('gui')
+    " this doesn't work with gvim on MS-Windows
+    return
+  endif
   if RunVim([], [], '--help >Xtestout')
     let lines = readfile('Xtestout')
     call assert_true(len(lines) > 20)
diff --git a/src/version.c b/src/version.c
index a7af293..9cf031b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2173,
+/**/
     2172,
 /**/
     2171,