diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile
index 78a39d9f7ef9..c186b2dc13f0 100644
--- a/sysutils/cpuburn/Makefile
+++ b/sysutils/cpuburn/Makefile
@@ -6,8 +6,7 @@ DISTVERSION=	1_4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/ \
 		http://atarininja.org/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	avg
+		LOCAL/avg
 DISTNAME=	cpuburn_${DISTVERSION}
 EXTRACT_SUFX=	_tar.gz
 
@@ -20,8 +19,10 @@ ONLY_FOR_ARCHS=	i386 amd64
 PORTDOCS=	README Design
 CPUS=		BX K6 K7 MMX P5 P6
 PLIST_FILES=	${CPUS:S+^+bin/burn+}
+USE_GCC=	yes
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-build:
 .for CPU in ${CPUS}
 	${CC} -m32 -s -nostdlib -o ${WRKSRC}/burn${CPU} ${WRKSRC}/burn${CPU}.S
@@ -29,12 +30,10 @@ do-build:
 
 do-install:
 .for CPU in ${CPUS}
-	${INSTALL_PROGRAM} ${WRKSRC}/burn${CPU} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/burn${CPU} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Design ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/Design ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>