diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index a61870e377bb..01abe40ed565 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,26 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:54 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/12/19 13:57:37 grant Exp $
 #
 
-DISTNAME=	xmountains_2.5
-PKGNAME=	xmountains-2.5
+DISTNAME=	xmountains_2.6
+PKGNAME=	${DISTNAME:C/_/-/}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.epcc.ed.ac.uk/~spb/xmountains/
 
-PATCH_SITES=	http://www.epcc.ed.ac.uk/~spb/xmountains/current_source/
-PATCHFILES=	vroot.h
-
-MAINTAINER=	fredb@netsd.org
+MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://www.epcc.ed.ac.uk/~spb/xmountains/
-COMMENT=	fractal terrain generator
+COMMENT=	Fractal terrain generator for X11
+
+USE_IMAKE=	YES
+USE_X11BASE=	YES
 
 WRKSRC=		${WRKDIR}
-USE_IMAKE=	yes
-
-DIST_SUBDIR=	xmountains
-CPPFLAGS+=	-DVROOT
-
-# XXX Hack. We really want an OTHER_SITES/OTHERFILES mechanism for this.
-do-patch:
-		${CP} ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmountains/PLIST b/x11/xmountains/PLIST
index c83ddc348d1b..a8fe2cf57744 100644
--- a/x11/xmountains/PLIST
+++ b/x11/xmountains/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/19 13:57:38 grant Exp $
 bin/xmountains
 man/cat1/xmountains.0
diff --git a/x11/xmountains/distinfo b/x11/xmountains/distinfo
index bb91d826c76c..86dcdeb88820 100644
--- a/x11/xmountains/distinfo
+++ b/x11/xmountains/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:57 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/12/19 13:57:38 grant Exp $
 
-SHA1 (xmountains/xmountains_2.5.tar.gz) = b8a89a776971cde4f72dc732233bfdc455702e2f
-Size (xmountains/xmountains_2.5.tar.gz) = 25061 bytes
-SHA1 (xmountains/vroot.h) = dfd8a653a4a01489147f8386bc6243144301f65b
-Size (xmountains/vroot.h) = 5056 bytes
+SHA1 (xmountains_2.6.tar.gz) = 36a1bf9933a56aad051aac112f1d0af0ebbe3802
+Size (xmountains_2.6.tar.gz) = 26890 bytes