diff --git a/x11-fonts/gentium-plus/Makefile b/x11-fonts/gentium-plus/Makefile
index 533e2a92ddd8..016103eae5ef 100644
--- a/x11-fonts/gentium-plus/Makefile
+++ b/x11-fonts/gentium-plus/Makefile
@@ -18,7 +18,7 @@ USE_ZIP=	yes
 XORG_CAT=	font
 
 FONTLIBPATH=	lib/X11/fonts
-FONTROOTDIR=	${PREFIX}/${FONTLIBPATH}
+FONTROOTDIR=	${STAGEDIR}${PREFIX}/${FONTLIBPATH}
 INSTALLS_TTF=	yes
 MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
 NO_BUILD=	yes
@@ -27,15 +27,13 @@ USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
 PLIST_FILES=	${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-I.ttf \
 		${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-R.ttf
 
-SUB_LIST=	"FONTPATH=${FONTROOTDIR}/${FONTDIR}"
+SUB_LIST=	"FONTPATH=${PREFIX}$FONTLIBPATH}/${FONTDIR}"
 SUB_FILES=	pkg-message
 
 DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt OFL.txt README.txt \
 		documentation/GentiumPlus-features.pdf
 PORTDOCS=	${DOCSLIST:C,^.*/,,}
 
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .SILENT:
@@ -44,9 +42,6 @@ do-configure:
 	@${DO_NADA}
 
 do-install: install-fonts install-docs
-	${ECHO_MSG}
-	${CAT} ${PKGMESSAGE}
-	${ECHO_MSG}
 
 install-fonts:
 	${MKDIR} ${FONTROOTDIR}/${FONTDIR}
@@ -54,8 +49,8 @@ install-fonts:
 
 install-docs:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>