diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index b75f25a2c..9497b8375 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -3,6 +3,8 @@
 	* smbfs.c (free_after): Moved here from src/util.h.
 	* fish.c (fish_ctl): Commented out some unused code with
 	#if 0 ... #endif. This fixes a warning from SunPro.
+	* mcfs.c (mcfs_get_remote_port): Shift an #endif two lines down
+	to avoid a warning from SunPro.
 
 2005-05-29  Leonard den Ottolander  <leonard * den ottolander nl>
 
diff --git a/vfs/mcfs.c b/vfs/mcfs.c
index c28a0600d..b03a91d83 100644
--- a/vfs/mcfs.c
+++ b/vfs/mcfs.c
@@ -207,9 +207,9 @@ mcfs_get_remote_port (struct sockaddr_in *sin, int *version)
 	if (port = pmap_getport (sin, RPC_PROGNUM, *version, IPPROTO_TCP))
 	    return port;
 #endif				/* HAVE_PMAP_GETPORT */
-#endif				/* HAVE_PMAP_GETMAPS */
     *version = 1;
     return mcserver_port;
+#endif				/* HAVE_PMAP_GETMAPS */
 }
 
 /* This used to be in utilvfs.c, but as it deals with portmapper, it