diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 352ee8674d8c..78291b160eea 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blitz++
 PORTVERSION=	0.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	SF/blitz/blitz/Blitz%2B%2B%20${PORTVERSION}
 DISTNAME=	blitz-${PORTVERSION}
@@ -11,26 +11,27 @@ DISTNAME=	blitz-${PORTVERSION}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	C++ class library for scientific computing
 
-.ifndef NOPORTDOCS
-BUILD_DEPENDS=	dvips:${PORTSDIR}/print/dvipsk-tetex \
-		texi2dvi:${PORTSDIR}/print/texinfo
-INFO=		blitz
-.else
-MAKE_ARGS=	NOPORTDOCS=yes
-.endif
+OPTIONS_DEFINE=	DOCS
 
-USE_AUTOTOOLS=	libtool
-USES=	pathfix gmake
-CONFIGURE_ARGS=	--with-cxx=gcc --disable-doxygen
+DOCS_USE=	TEX=dvipsk,formats
+DOCS_USES=	makeinfo
+DOCS_INFO=	blitz
+DOCS_BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo \
+			texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=yes
+
+GNU_CONFIGURE=	yes
+USES=	libtool pathfix gmake
+CONFIGURE_ARGS=	--with-cxx=gcc --disable-doxygen --enable-shared
 MAKE_ARGS+=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 MAKE_JOBS_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
 
 DOCSDIR=	${PREFIX}/share/doc/blitz
 
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|g++|\$${CXX}|g ; \
 		 s|"-ftemplate-depth-30|"\$${CXXFLAGS} -ftemplate-depth-30|g ; \
diff --git a/math/blitz++/pkg-plist b/math/blitz++/pkg-plist
index 36b9fcab0adb..998d4f336011 100644
--- a/math/blitz++/pkg-plist
+++ b/math/blitz++/pkg-plist
@@ -161,9 +161,9 @@ include/random/mt.h
 include/random/normal.h
 include/random/uniform.h
 lib/libblitz.a
-lib/libblitz.la
 lib/libblitz.so
 lib/libblitz.so.0
+lib/libblitz.so.0.0.0
 libdata/pkgconfig/blitz.pc
 libdata/pkgconfig/blitz-uninstalled.pc
 %%PORTDOCS%%%%DOCSDIR%%/blitz.gif