diff --git a/src/os_unix.c b/src/os_unix.c
index 314a906d61..4c63eeba14 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2507,8 +2507,10 @@ mch_FullName(fname, buf, len, force)
     fname = posix_fname;
 #endif
 
-    /* expand it if forced or not an absolute path */
-    if (force || !mch_isFullName(fname))
+    /* Expand it if forced or not an absolute path.
+     * Do not do it for "/file", the result is always "/". */
+    if ((force || !mch_isFullName(fname))
+	    && ((p = vim_strrchr(fname, '/')) == NULL || p != fname))
     {
 	/*
 	 * If the file name has a path, change to that directory for a moment,
@@ -2517,11 +2519,11 @@ mch_FullName(fname, buf, len, force)
 	 */
 #ifdef OS2
 	only_drive = 0;
-	if (((p = vim_strrchr(fname, '/')) != NULL)
+	if (p != NULL
 		|| ((p = vim_strrchr(fname, '\\')) != NULL)
 		|| (((p = vim_strchr(fname,  ':')) != NULL) && ++only_drive))
 #else
-	if ((p = vim_strrchr(fname, '/')) != NULL)
+	if (p != NULL)
 #endif
 	{
 #ifdef HAVE_FCHDIR
diff --git a/src/version.c b/src/version.c
index 965eec415a..089546fd0f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1007,
 /**/
     1006,
 /**/