diff --git a/x11-wm/9menu/Makefile b/x11-wm/9menu/Makefile
index 70e9b94437c6..4a3ed48ac0e4 100644
--- a/x11-wm/9menu/Makefile
+++ b/x11-wm/9menu/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	9menu
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	x11-wm plan9
-MASTER_SITES=	ftp://ftp.comintern.ru/pub/unix/X11/plan9/ \
-		ftp://ftp.mathcs.emory.edu/pub/arnold/
-		
+MASTER_SITES=	ftp://quenix.dyndns.org/freebsd/ \
+		http://mitglied.lycos.de/buran/linux/soft/9menu/
 EXTRACT_SUFX=	.shar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gagnon__s@videotron.ca
 COMMENT=	A simple menu patterened after plan9
 
-USE_XLIB=	yes
-NO_WRKSUBDIR=	yes
+USE_XLIB=		yes
 EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
+MAKEFILE=		Makefile.noimake
+ALL_TARGET=		9menu
 
 MAN1=		9menu.1
 MANCOMPRESSED=	yes
diff --git a/x11-wm/9menu/distinfo b/x11-wm/9menu/distinfo
index d6453026cf3e..4632600d1aec 100644
--- a/x11-wm/9menu/distinfo
+++ b/x11-wm/9menu/distinfo
@@ -1 +1 @@
-MD5 (9menu-1.5.shar.gz) = 00f8dcb2bd1ab9291ce15834eb4e1588
+MD5 (9menu-1.6.shar.gz) = d2a2bc7e10356254814fa4193df4d692
diff --git a/x11-wm/9menu/files/patch-aa b/x11-wm/9menu/files/patch-aa
index 375c3ac91895..b4f58f7337c7 100644
--- a/x11-wm/9menu/files/patch-aa
+++ b/x11-wm/9menu/files/patch-aa
@@ -1,5 +1,5 @@
 *** Makefile.orig	Fri Aug 11 15:55:35 1995
---- Makefile	Fri Aug 11 16:03:26 1995
+--- Makefile.noimake	Fri Aug 11 16:03:26 1995
 ***************
 *** 6,13 ****
   # arnold@skeeve.atl.ga.us
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 70e9b94437c6..4a3ed48ac0e4 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	9menu
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	x11-wm plan9
-MASTER_SITES=	ftp://ftp.comintern.ru/pub/unix/X11/plan9/ \
-		ftp://ftp.mathcs.emory.edu/pub/arnold/
-		
+MASTER_SITES=	ftp://quenix.dyndns.org/freebsd/ \
+		http://mitglied.lycos.de/buran/linux/soft/9menu/
 EXTRACT_SUFX=	.shar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gagnon__s@videotron.ca
 COMMENT=	A simple menu patterened after plan9
 
-USE_XLIB=	yes
-NO_WRKSUBDIR=	yes
+USE_XLIB=		yes
 EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
+MAKEFILE=		Makefile.noimake
+ALL_TARGET=		9menu
 
 MAN1=		9menu.1
 MANCOMPRESSED=	yes
diff --git a/x11/9menu/distinfo b/x11/9menu/distinfo
index d6453026cf3e..4632600d1aec 100644
--- a/x11/9menu/distinfo
+++ b/x11/9menu/distinfo
@@ -1 +1 @@
-MD5 (9menu-1.5.shar.gz) = 00f8dcb2bd1ab9291ce15834eb4e1588
+MD5 (9menu-1.6.shar.gz) = d2a2bc7e10356254814fa4193df4d692
diff --git a/x11/9menu/files/patch-aa b/x11/9menu/files/patch-aa
index 375c3ac91895..b4f58f7337c7 100644
--- a/x11/9menu/files/patch-aa
+++ b/x11/9menu/files/patch-aa
@@ -1,5 +1,5 @@
 *** Makefile.orig	Fri Aug 11 15:55:35 1995
---- Makefile	Fri Aug 11 16:03:26 1995
+--- Makefile.noimake	Fri Aug 11 16:03:26 1995
 ***************
 *** 6,13 ****
   # arnold@skeeve.atl.ga.us