diff --git a/[refs] b/[refs]
index f8ce37e8287a..ceba8d42225c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0472d0ec89bef2ea4432828c3daa1b26ef569aa
+refs/heads/master: 58f7f68f228c3aba2ba4468d92e2cec35724ba2e
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 10151f8d8495..6298dc32adeb 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -958,7 +958,8 @@ cifs_parse_mount_options(char *options, const char *devname,
 				}
 				strcpy(vol->password, value);
 			}
-		} else if (strnicmp(data, "ip", 2) == 0) {
+		} else if (!strnicmp(data, "ip", 2) ||
+			   !strnicmp(data, "addr", 4)) {
 			if (!value || !*value) {
 				vol->UNCip = NULL;
 			} else if (strnlen(value, INET6_ADDRSTRLEN) <