diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile
index 6ec3a86742e9..3becd28cc9d5 100644
--- a/comms/spandsp-devel/Makefile
+++ b/comms/spandsp-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	spandsp
 DISTVERSION=	0.0.6pre21
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.soft-switch.org/downloads/spandsp/
 PKGNAMESUFFIX=	-devel
@@ -28,20 +29,21 @@ CONFLICTS=	spandsp-[0-9]*
 
 OPTIONS_DEFINE=	DOXYGEN
 
+PORTDOCS=	*
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOXYGEN}
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--enable-doc
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
 		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 USE_GNOME+=	libxslt
-PORTDOCS=	*
 .else
 CONFIGURE_ARGS+=--disable-doc
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOXYGEN}
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/doc && \
 		${COPYTREE_SHARE} \* ${DOCSDIR} "-type d -or -mindepth 1")