diff --git a/[refs] b/[refs]
index b71263860b27..c39e93c4028b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 611c96c8f728c4bcdbadaa2387942d3c0641cadf
+refs/heads/master: aa69947399a119d7f1b35bbcd62c849839b35449
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 4100630c9a5b..dd56eec16eac 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -598,7 +598,9 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
 
 	if (nfss->mountd_version || showdefaults)
 		seq_printf(m, ",mountvers=%u", nfss->mountd_version);
-	if (nfss->mountd_port || showdefaults)
+	if ((nfss->mountd_port &&
+		nfss->mountd_port != (unsigned short)NFS_UNSPEC_PORT) ||
+		showdefaults)
 		seq_printf(m, ",mountport=%u", nfss->mountd_port);
 
 	nfs_show_mountd_netid(m, nfss, showdefaults);