diff --git a/src/globals.h b/src/globals.h
index 5d7295a..a7cc171 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1092,6 +1092,7 @@
 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 ea7d0e1..b8d13d9 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3572,8 +3572,9 @@
 #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 d58ba30..639ef31 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2221,7 +2221,6 @@
      * 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 e636520..05e088f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    180,
+/**/
     179,
 /**/
     178,