diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 2f20d4bfe7ed..f0800aeb0103 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -5,18 +5,14 @@ PORTNAME=	xbmbrowser
 PORTVERSION=	5.1
 PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITES=	XCONTRIB
 MASTER_SITE_SUBDIR=	utilities
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View complete directories of X bitmaps and X pixmaps
 
-USES=		imake
+USES=		gmake imake
 USE_XORG=	xaw xmu
-MAN1=		xbmbrowser.1
 
-USE_GMAKE=	yes
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/graphics/xbmbrowser/pkg-plist b/graphics/xbmbrowser/pkg-plist
index b4684fb8921a..1af005cb635a 100644
--- a/graphics/xbmbrowser/pkg-plist
+++ b/graphics/xbmbrowser/pkg-plist
@@ -3,4 +3,5 @@ lib/X11/app-defaults/XbmBrowser
 lib/X11/app-defaults/XbmBrowser-color
 lib/X11/xbmbrowser/xbmbrowser.menu
 lib/X11/xbmbrowser/xbmbrowser.menu.tut
+man/man1/xbmbrowser.1.gz
 @dirrm lib/X11/xbmbrowser