diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 9d269dc9572d..29d0af12d207 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -25,7 +25,6 @@ PATCH_WRKSRC=	${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}
 USE_GMAKE=	yes
 MAKEFILE=	gcc-freebsd.mak
 MAKE_ARGS=	INSTALLDIR=${PREFIX}
-ALL_TARGET=	clean all
 INSTALL_TARGET=	install_unix
 INSTALLS_SHLIB=	yes
 
@@ -41,4 +40,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/../doc/images/* ${DOCSDIR}/images
 .endif
 
+post-build test:
+	cd ${WRKSRC}/../test/eh && ${GMAKE} -f ${MAKEFILE}
+
 .include <bsd.port.post.mk>
diff --git a/devel/stlport/files/patch-cxxflags b/devel/stlport/files/patch-cxxflags
new file mode 100644
index 000000000000..c14a2abb9419
--- /dev/null
+++ b/devel/stlport/files/patch-cxxflags
@@ -0,0 +1,9 @@
+--- src/gcc-freebsd.mak	Tue Nov 27 02:17:56 2001
++++ src/gcc-freebsd.mak	Sun Mar 10 12:59:08 2002
+@@ -43,4 +43,4 @@
+ 
+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
+