diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index fec4b096fd41..a32dc5dcde8f 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -16,8 +16,11 @@ COMMENT=	Print formatter driven by XSL formatting
 
 EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+PORTDOCS=	*
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -26,27 +29,24 @@ USE_ANT=	yes
 # Prevent out of memory error during build
 MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
 
-NO_STAGE=	yes
 post-extract:
 	@cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation_v2.0.zip
 	@${CP} ${WRKDIR}/offo-hyphenation/hyph/*.xml ${WRKSRC}/hyph
 
 do-install:
 .for d in build conf lib
-	@${MKDIR} ${DATADIR}/${d}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/${d}
 .endfor
 	@cd ${WRKSRC} && \
-	    ${INSTALL_DATA} status.xml ${DATADIR}/ && \
-	    ${INSTALL_DATA} build/*.[jw]ar ${DATADIR}/build/ && \
-	    ${INSTALL_DATA} lib/*.jar lib/README.txt ${DATADIR}/lib/ && \
-	    ${INSTALL_DATA} conf/fop.xconf ${DATADIR}/conf/ && \
-	    ${COPYTREE_SHARE} hyph ${DATADIR}/
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${DATADIR}/
-	@${LN} -s ${DATADIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	    ${INSTALL_DATA} status.xml ${STAGEDIR}${DATADIR} && \
+	    ${INSTALL_DATA} build/*.[jw]ar ${STAGEDIR}${DATADIR}/build && \
+	    ${INSTALL_DATA} lib/*.jar lib/README.txt ${STAGEDIR}${DATADIR}/lib && \
+	    ${INSTALL_DATA} conf/fop.xconf ${STAGEDIR}${DATADIR}/conf && \
+	    ${COPYTREE_SHARE} hyph ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
+	${LN} -s ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_MAN} LICENSE README NOTICE KEYS ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_MAN} LICENSE README NOTICE KEYS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist
index 7cba34ef1cab..bf082f82ccc2 100644
--- a/textproc/fop/pkg-plist
+++ b/textproc/fop/pkg-plist
@@ -86,13 +86,8 @@ bin/fop
 %%DATADIR%%/lib/xml-apis-1.3.04.jar
 %%DATADIR%%/lib/xml-apis-ext-1.3.04.jar
 %%DATADIR%%/lib/xmlgraphics-commons-1.5.jar
-%%PORTDOCS%%%%DOCSDIR%%/KEYS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NOTICE
-%%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/hyph
 @dirrm %%DATADIR%%/conf
 @dirrm %%DATADIR%%/build
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%