diff --git a/src/job.c b/src/job.c
index 16fc7c7..aeb2af7 100644
--- a/src/job.c
+++ b/src/job.c
@@ -887,6 +887,11 @@
 }
 #endif
 
+// Unix uses argv[] for the command, other systems use a string.
+#if defined(UNIX)
+# define USE_ARGV
+#endif
+
 #if !defined(USE_ARGV) || defined(PROTO)
 /*
  * Escape one argument for an external command.
@@ -1269,9 +1274,7 @@
     char	**argv = NULL;
     int		argc = 0;
     int		i;
-#if defined(UNIX)
-# define USE_ARGV
-#else
+#ifndef USE_ARGV
     garray_T	ga;
 #endif
     jobopt_T	opt;
diff --git a/src/version.c b/src/version.c
index 21d051e..7554fb3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2118,
+/**/
     2117,
 /**/
     2116,