diff --git a/runtime/menu.vim b/runtime/menu.vim
index 23347947606724bca14695e3466775a35cbe6464..2f3cd3df5b8eab1e9fb2551918f4a349436ab88e 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -384,7 +384,7 @@ endif
 " Programming menu
 if !exists("g:ctags_command")
   if has("vms")
-    let g:ctags_command = "mc vim:ctags ."
+    let g:ctags_command = "mc vim:ctags *.*"
   else
     let g:ctags_command = "ctags -R ."
   endif
diff --git a/src/globals.h b/src/globals.h
index 5d7295a84339eeaa4f2c7fbd47366191f560741a..a7cc1716fb56d44d496701a400d0a331b44e372e 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1092,6 +1092,7 @@ extern char_u *all_cflags;
 extern char_u *all_lflags;
 # ifdef VMS
 extern char_u *compiler_version;
+extern char_u *compiled_arch;
 # endif
 extern char_u *compiled_user;
 extern char_u *compiled_sys;
diff --git a/src/memline.c b/src/memline.c
index ea7d0e13b28a61d9cb76c837f899157a75beeb74..b8d13d942d4030316b4d8c405e6312322f0d78de 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3572,8 +3572,9 @@ makeswapname(fname, ffname, buf, dir_name)
 #else
 	    (buf->b_p_sn || buf->b_shortname),
 #endif
-#ifdef RISCOS
-	    /* Avoid problems if fname has special chars, eg <Wimp$Scrap> */
+#if defined(VMS) || defined(RISCOS)
+	    /* Avoid problems if fname has special chars, eg <Wimp$Scrap>.
+	     * For VMS always use full path for swapfile. */
 	    ffname,
 #else
 # ifdef HAVE_READLINK
diff --git a/src/os_unix.c b/src/os_unix.c
index d58ba302c9aceec308024dd8c1b0500c6cf2b13d..639ef312769b981c255a41d03c3a2e3c1b2cf009 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2221,7 +2221,6 @@ mch_FullName(fname, buf, len, force)
      * behaviour should be avoided for the existing files and we need to find
      * the exact path of the edited file.
      */
-    if (force || !mch_isFullName(fname))
     {
 	char_u	*fixed_fname = vms_fixfilename(fname);
 	int	fd = mch_open((char *)fixed_fname, O_RDONLY | O_EXTRA, 0);
diff --git a/src/version.c b/src/version.c
index e636520e1e7d1f385384bf90fbfb757aa4c08ebb..05e088f97de322c964283c3977c9344829b43144 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 */
+/**/
+    180,
 /**/
     179,
 /**/