diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index aba5433a8493..61b78172078b 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/07/14 06:19:43 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2010/03/17 09:53:08 sbd Exp $
 #
 
 DISTNAME=		xorg-cf-files-1.0.2
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,6 +16,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(IMAKE_TOOLS) && !empty(IMAKE_TOOLS:Mgmake)
+USE_TOOLS+=		gmake
+.endif
+
 post-extract:
 	${CP} ${FILESDIR}/host.def ${WRKSRC}
 	${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}