Index: head/www/mod_rpaf2/Makefile
===================================================================
--- head/www/mod_rpaf2/Makefile	(revision 485945)
+++ head/www/mod_rpaf2/Makefile	(revision 485946)
@@ -1,41 +1,41 @@
 # Created by: Clement Laforet <clement@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mod_rpaf
 PORTVERSION=	0.8.4
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Make proxied requests appear with client IP
 
 LICENSE=	APACHE20
 
+USES=		apache:2.2+
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnif
 
-DOCS=	README.md
-
-USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 SHORTMODNAME=	rpaf
 
 SRC_FILE=	mod_rpaf.c
 
 APMOD_FILE=	200_mod_rpaf.conf.sample
 PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
-PLIST_FILES=	@sample\ %%APACHEETCDIR%%/modules.d/200_${PORTNAME}.conf.sample \
-		%%APACHEMODDIR%%/${PORTNAME}.so
+PLIST_FILES=	@sample\ ${APACHEETCDIR}/modules.d/200_${PORTNAME}.conf.sample \
+		${APACHEMODDIR}/${PORTNAME}.so
 SUB_FILES=	${APMOD_FILE}
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/www/mod_rpaf2/files/200_mod_rpaf.conf.sample.in
===================================================================
--- head/www/mod_rpaf2/files/200_mod_rpaf.conf.sample.in	(revision 485945)
+++ head/www/mod_rpaf2/files/200_mod_rpaf.conf.sample.in	(revision 485946)
@@ -1,33 +1,33 @@
 LoadModule rpaf_module	%%APACHEMODDIR%%/mod_rpaf.so
-<IfModule mod_rpaf>
+<IfModule rpaf_module>
   # Enable reverse proxy add forward
   #RPAF_Enable On
 
   # What IPs & bitmasked subnets to adjust requests for
   #RPAF_ProxyIPs 127.0.0.1 10.0.0.0/24
 
   # The header to use for the real IP address
   #RPAF_Header X-Forwarded-For
 
   # Update vhost name so ServerName & ServerAlias work
   #RPAF_SetHostName Off
 
   # Set the HTTPS environment variable
   # to the header value contained in
   # X-HTTPS, or X-Forwarded-HTTPS. For
   # best results make sure that mod_ssl
   # is NOT enabled.
   #RPAF_SetHTTPS Off
 
   # Set the server port to the header
   # value contained in X-Port, or
   # X-Forwarded-Port.
   # (see https://github.com/gnif/mod_rpaf/issues/12)
   #RPAF_SetPort Off
 
   # Option to forbid request if not from
   # trusted RPAF_ProxyIPs; otherwise
   # cannot be done with Allow/Deny after
   # remote addr substitution
   #RPAF_ForbidIfNotProxy Off
 </IfModule>