diff --git a/src/main.c b/src/main.c
index 2a90cc3580..86558e0f47 100644
--- a/src/main.c
+++ b/src/main.c
@@ -564,7 +564,11 @@ main
      */
     if (p_lpl)
     {
+# ifdef VMS	/* Somehow VMS doesn't handle the "**". */
+	source_runtime((char_u *)"plugin/*.vim", TRUE);
+# else
 	source_runtime((char_u *)"plugin/**/*.vim", TRUE);
+# endif
 	TIME_MSG("loading plugins");
     }
 #endif
diff --git a/src/version.c b/src/version.c
index b3074a6273..7387458b0c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    18,
 /**/
     17,
 /**/