diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile
index a70a8deeeecf..1edb02df98cd 100644
--- a/devel/ahven/Makefile
+++ b/devel/ahven/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ahven
 PORTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Ahven%20${PORTVERSION}
 
@@ -16,6 +16,7 @@ BUILD_DEPENDS=	adactl:${PORTSDIR}/lang/adacontrol
 
 USES=		ada
 ALL_TARGET=	build_all
+INSTALL_TARGET=	install_lib
 MAKE_ENV+=	OS_VERSION=unix
 
 OPTIONS_DEFINE=	TRACE DOCS
@@ -24,18 +25,13 @@ NO_OPTIONS_SORT=yes
 
 TRACE_DESC=	Build with GNAT-specific symbolic tracing functionality
 
-.include <bsd.port.options.mk>
+DOCS_USES=		python:build
+DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:${PORTSDIR}/textproc/py-sphinxcontrib-adadomain
+DOCS_ALL_TARGET=	docs
+DOCS_INSTALL_TARGET=	install_docs
 
-.if ${PORT_OPTIONS:MDOCS}
-USES+=		python:build
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:${PORTSDIR}/textproc/py-sphinxcontrib-adadomain
-ALL_TARGET+=	docs
-.endif
-
-.if ${PORT_OPTIONS:MTRACE}
-EXTRA_PATCHES=	${FILESDIR}/extra-src_ahven-framework.adb
-.endif
+TRACE_EXTRA_PATCHES=	${FILESDIR}/extra-src_ahven-framework.adb
 
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/ahven/html/_sources
diff --git a/devel/ahven/pkg-plist b/devel/ahven/pkg-plist
index 98fadfb1dae7..5fbe550792ac 100644
--- a/devel/ahven/pkg-plist
+++ b/devel/ahven/pkg-plist
@@ -51,12 +51,14 @@ lib/gnat/ahven.gpr
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-1.11.1.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/nature.css
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png