diff --git a/www/mod_amazon_proxy/Makefile b/www/mod_amazon_proxy/Makefile
index 546ba9faae93..ae26408ff547 100644
--- a/www/mod_amazon_proxy/Makefile
+++ b/www/mod_amazon_proxy/Makefile
@@ -10,9 +10,10 @@ MASTER_SITE_SUBDIR=	tota/${PORTNAME}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Amazon Auth Proxy for Product Advertising API
 
-LIB_DEPENDS=	apreq2:${PORTSDIR}/www/libapreq2
+LIB_DEPENDS=	libapreq2.so:${PORTSDIR}/www/libapreq2
 
 USE_APACHE=	22
+AP_FAST_BUILD=	yes
 
 CONFFILE=	httpd-amazon-proxy.conf
 CONFDIR=	${PREFIX}/${APACHEETCDIR}/Includes
@@ -20,36 +21,27 @@ CONFDIR=	${PREFIX}/${APACHEETCDIR}/Includes
 PORTDOCS=	README
 PORTEXAMPLES=	rpaproxy.yaml
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|modules|${APACHEMODDIR}|' ${WRKSRC}/${CONFFILE}.sample
 
-do-build:
-	@${APXS} -c ${BUILD_WRKSRC}/${PORTNAME}.c
-
-do-install:
-	@${APXS} -i ${INSTALL_WRKSRC}/${PORTNAME}.la
-	${INSTALL_DATA} ${WRKSRC}/${CONFFILE}.sample ${CONFDIR}
-	@if [ ! -f ${CONFDIR}/${CONFFILE} ]; then \
-		${CP} -p ${CONFDIR}/${CONFFILE}.sample ${CONFDIR}/${CONFFILE}; \
-	fi
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR}
-.endif
+post-install:
+	@${MKDIR} ${STAGEDIR}${CONFDIR}
+	${INSTALL_DATA} ${WRKSRC}/${CONFFILE}.sample ${STAGEDIR}${CONFDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 x-generate-tarball:
 	${SETENV} ${FETCH_ENV} ${FETCH_BINARY} -m -o ${PORTNAME}.tar.gz \
 		https://github.com/machu/mod_amazon_proxy/tarball/master
 	target=`${TAR} -tvf ${PORTNAME}.tar.gz | head -n 1`; \
 	dir=`${ECHO} $${target} | ${AWK} '{print $$9}' | ${SED} -e 's|/$$||'`; \
-	year=`${ECHO} $${target} | ${AWK} '{print $$8}`; \
-	month=`${ECHO} $${target} | ${AWK} '{print $$6}`; \
-	day=`${ECHO} $${target} | ${AWK} '{print $$7}`; \
+	year=`${ECHO} $${target} | ${AWK} '{print $$8}'`; \
+	month=`${ECHO} $${target} | ${AWK} '{print $$6}'`; \
+	day=`${ECHO} $${target} | ${AWK} '{print $$7}'`; \
 	date=`date -j -f "%B %d %Y" "$${month} $${day} $${year}" +"%Y%m%d"`; \
 	${TAR} -zxf ${PORTNAME}.tar.gz; \
 	${RM} ${PORTNAME}.tar.gz; \
diff --git a/www/mod_amazon_proxy/pkg-descr b/www/mod_amazon_proxy/pkg-descr
index 870387603492..10d2fd606a61 100644
--- a/www/mod_amazon_proxy/pkg-descr
+++ b/www/mod_amazon_proxy/pkg-descr
@@ -1,4 +1,4 @@
 Authentication Proxy Server of Amazon Product Advertising API for
 Apache module.
 
-WWW:	https://github.com/machu/mod_amazon_proxy
+WWW: https://github.com/machu/mod_amazon_proxy
diff --git a/www/mod_amazon_proxy/pkg-plist b/www/mod_amazon_proxy/pkg-plist
index 5c1bad985fba..142ae85cca8d 100644
--- a/www/mod_amazon_proxy/pkg-plist
+++ b/www/mod_amazon_proxy/pkg-plist
@@ -1,4 +1,2 @@
 %%APACHEMODDIR%%/mod_amazon_proxy.so
-@unexec if cmp -s %D/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf.sample %D/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf; then rm -f %D/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf; fi
-%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf.sample
-@exec [ -f %B/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf ] || cp %B/%f %B/%%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf
+@sample %%APACHEETCDIR%%/Includes/httpd-amazon-proxy.conf.sample