diff --git a/devel/stxxl/Makefile b/devel/stxxl/Makefile
index ce0103ae65e4..cdd6099259e1 100644
--- a/devel/stxxl/Makefile
+++ b/devel/stxxl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Standard Template Library for Extra Large Data Sets
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	library_g++
 
 MAKE_ENV+=	COMPILER_GCC="${CXX}" OPT="${CXXFLAGS}" \
@@ -20,14 +20,12 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=OPTIMIZED_CFLAGS
 
+OPTIMIZED_CFLAGS_CXXFLAGS=	-O3
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CXXFLAGS+=	-O3
-.endif
-
-.if ${OSVERSION} >= 1000000
 post-patch:
+.if ${OSVERSION} >= 1000000
 	@${REINPLACE_CMD} -i '' -e 's|std::tr1::|std::|' \
 		${WRKSRC}/include/stxxl/bits/compat/type_traits.h \
 		${WRKSRC}/include/stxxl/bits/compat/shared_ptr.h \
@@ -36,13 +34,14 @@ post-patch:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
-	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} "${PORTNAME} ${PORTNAME}.h" \
+	cd ${WRKSRC}/include && ${COPYTREE_SHARE} "${PORTNAME} ${PORTNAME}.h" \
 		${STAGEDIR}${PREFIX}/include
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${RM} -f ${STAGEDIR}${PREFIX}/include/stxxl/bits/mng/config.h.orig
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 regression-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} tests_g++
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tests_g++
 	cd ${WRKSRC}/misc && ${SH} run-all-tests
 
 .include <bsd.port.mk>