diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index 6b7667b84478..45ff9cf768d3 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -19,21 +19,24 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 PLIST_SUB+=	_PREFIX="${PREFIX}"
 MAKE_ENV+=	FILESDIR="${FILESDIR}" STAGEDIR="${STAGEDIR}"
 
-USE_BZIP2=	yes
-USES=	uidfix
+USES=		tar:bzip2 uidfix
 
 EXTRACT_AFTER_ARGS= \
 	'${DISTNAME}/mkspecs' \
 	'${DISTNAME}/src/*/*.h' '${DISTNAME}/qmake' \
 	'${DISTNAME}/src/tools'
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 EXTRACT_AFTER_ARGS+='${DISTNAME}/doc/html/qmake*'
-DOCSDIR=${PREFIX}/share/doc/qt
-PLIST_SUB+=	DOCSDIR='${DOCSDIR}'
+DOCSDIR=	${PREFIX}/share/doc/qt
+PLIST_SUB+=	DOCSDIR="${DOCSDIR}"
 post-install:
-	${MKDIR} '${DOCSDIR}'
-	${CP} -Rp '${WRKSRC:H}/doc/html' '${DOCSDIR}'
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${CP} -Rp ${WRKSRC:H}/doc/html ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-patch:
@@ -55,10 +58,4 @@ do-configure:
 	${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/qmodules.h
 	${LN} -s . ${WRKDIR}/${DISTNAME}/src/tools/private
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha"
-CXXFLAGS+=	-mieee
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qmake/pkg-plist b/devel/qmake/pkg-plist
index 6eadb5351fe5..1c125e5721eb 100644
--- a/devel/qmake/pkg-plist
+++ b/devel/qmake/pkg-plist
@@ -193,15 +193,15 @@ win32-watcom/qmake.conf
 @dirrm win32-watcom
 @unexec rmdir %%_PREFIX%%/share/qt/mkspecs
 @unexec rmdir %%_PREFIX%%/share/qt || echo %%_PREFIX%%/share/qt is still in use -- probably by the rest of Qt
-%%PORTDOCS%%@cwd %%DOCSDIR%%
-%%PORTDOCS%%html/qmake.dcf
-%%PORTDOCS%%html/qmake-manual.html
-%%PORTDOCS%%html/qmake-manual-1.html
-%%PORTDOCS%%html/qmake-manual-2.html
-%%PORTDOCS%%html/qmake-manual-3.html
-%%PORTDOCS%%html/qmake-manual-4.html
-%%PORTDOCS%%html/qmake-manual-5.html
-%%PORTDOCS%%html/qmake-manual-6.html
-%%PORTDOCS%%html/qmake-manual-7.html
-%%PORTDOCS%%html/qmake-manual-8.html
-%%PORTDOCS%%@unexec (rmdir %%DOCSDIR%%/html && rmdir %%DOCSDIR%%) || echo %%DOCSDIR%% is still in use -- by other Qt docs?
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake.dcf
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-8.html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%