Index: head/www/mod_http2-devel/Makefile
===================================================================
--- head/www/mod_http2-devel/Makefile	(revision 455908)
+++ head/www/mod_http2-devel/Makefile	(revision 455909)
@@ -1,51 +1,48 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	mod_http2-devel
+PORTNAME=	mod_http2
 PORTVERSION=	1.10.14
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
+PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Early experience HTTP/2 modules for Apache httpd
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 
 USES=		autoreconf libtool ssl
 USE_GITHUB=	yes
 USE_APACHE=	24+
 
 GH_ACCOUNT=	icing
 GH_PROJECT=	mod_h2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=ext-
-CONFIGURE_ENV=	CONFIG_SHELL=/bin/sh
 
 MODULENAME=	${GH_PROJECT}
 
 CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
 
 PORTDOCS=	README README.md
 PLIST_FILES=	${APACHEMODDIR}/mod_h2.so \
 		${APACHEMODDIR}/mod_proxy_h2.so
 
 post-install:
 	# Rename mod_http2 to mod_h2 to avoid conflict with Apache24
 	${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_http2.so.0.0.0 \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 	${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so.0.0.0 \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_http2.so
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so
-	${MV} ${STAGEDIR}${PREFIX}/share/doc/mod_http2 \
-		${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so
 	${RM} -v ${STAGEDIR}${DOCSDIR}/LICENSE
 
 .include <bsd.port.mk>
Index: head/www/mod_md-devel/Makefile
===================================================================
--- head/www/mod_md-devel/Makefile	(revision 455908)
+++ head/www/mod_md-devel/Makefile	(revision 455909)
@@ -1,50 +1,50 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mod_md
 PORTVERSION=	1.0.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
+PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Early experience LetsEncrypt module for Apache httpd
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libaprutil-1.so:devel/apr1 \
 		libcurl.so:ftp/curl \
 		libjansson.so:devel/jansson
 
 USES=		autoreconf libtool ssl
 USE_GITHUB=	yes
-USE_APACHE=	24
+USE_APACHE=	24+
 
 GH_ACCOUNT=	icing
 GH_PROJECT=	mod_md
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} \
 		--with-jansson=${LOCALBASE}
 
 DOCSDIR=	share/doc/mod_md
 PORTDOCS=	README README.md
 PLIST_FILES=	${APACHEMODDIR}/mod_md.so.0.0.0 \
 		${APACHEMODDIR}/mod_md.so \
 		bin/a2md
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
 IGNORE=		port requires OpenSSL 1.0.2 or later, set DEFAULT_VERSIONS+= ssl=openssl
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so \
 		${WRKSRC}/src/a2md
 	${INSTALL} ${WRKSRC}/src/a2md ${STAGEDIR}${PREFIX}/bin/a2md
 	${RM} ${STAGEDIR}${PREFIX}/share/doc/mod_md/LICENSE
-#	${RM} ${STAGEDIR}${PREFIX}/bin/ext-a2md
 
 .include <bsd.port.post.mk>