diff --git a/audio/fapg/Makefile b/audio/fapg/Makefile
index 0810a93f26ee..9cb6b7a99ee0 100644
--- a/audio/fapg/Makefile
+++ b/audio/fapg/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Fast Audio Playlist Generator
 LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
 
 MAKE_ARGS+=	CC="${CC}"
-NO_STAGE=	yes
 
-MAN1=		fapg.1
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
@@ -22,14 +21,12 @@ do-build:
 	@cd ${WRKSRC} && ${MAKE} ${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/fapg.1 ${MAN1PREFIX}/man/man1
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/fapg.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in COPYING README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/audio/fapg/pkg-plist b/audio/fapg/pkg-plist
index 8f33f57180df..62cad86f1b11 100644
--- a/audio/fapg/pkg-plist
+++ b/audio/fapg/pkg-plist
@@ -1,4 +1,5 @@
 bin/fapg
+man/man1/fapg.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%