diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index e44d3a8f1914..9a296906da3c 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -1,64 +1,65 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.99.20160129
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 
 LICENSE=	MIT
 
 BROKEN_powerpc64=	Does not build
 
 BUILD_DEPENDS=	jam:devel/jam
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aox
 GH_PROJECT=	aox
 GH_TAGNAME=	e10c73a
 
 USES=		perl5 pgsql:9.1+ ssl tar:bzip2
 USE_PERL5=	build
+WITH_PGSQL=	client
 
 PORTDOCS=	COPYING README license.txt
 
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
 CONFLICTS=	archiveopteryx-[0-9]*
 
 USERS=		aox
 GROUPS=		aox
 PLIST_SUB+=	USERS="${USERS}"
 PLIST_SUB+=	GROUPS="${GROUPS}"
 
 JAM?=		${LOCALBASE}/bin/jam
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD 10+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 JAMARG=	"-sCLANG=1"
 .endif
 
 post-patch:
 	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		-e 's,%%PREFIX%%,${PREFIX},g'
 	${REINPLACE_CMD} -e "s|\(C++FLAGS =\)|\1 -I${OPENSSLINC}|g" \
 		-e"s|INSTALLROOT ?= \"\" ;|INSTALLROOT = \"${STAGEDIR}\" ;|" \
 		${WRKSRC}/Jamsettings
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/server/Jamfile
 
 do-build:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG}
 
 do-install:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG} install
 
 .include <bsd.port.post.mk>
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index f9887c45473c..7098f1642de1 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -1,57 +1,58 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/download/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 
 LICENSE=	MIT
 
 BROKEN_powerpc64=	Does not build
 
 BUILD_DEPENDS=	jam:devel/jam
 
 USES=		perl5 pgsql:9.1+ ssl tar:bzip2
 USE_PERL5=	build
+WITH_PGSQL=	client
 
 PORTDOCS=	COPYING README bsd.txt
 
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		aox
 GROUPS=		aox
 PLIST_SUB+=	USERS="${USERS}"
 PLIST_SUB+=	GROUPS="${GROUPS}"
 
 JAM?=		${LOCALBASE}/bin/jam
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD 10+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 JAMARG=	"-sCLANG=1"
 .endif
 
 post-patch:
 	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		-e 's,%%PREFIX%%,${PREFIX},g'
 	${REINPLACE_CMD} -e "s|\(C++FLAGS =\)|\1 -I${OPENSSLINC}|g" \
 		-e"s|INSTALLROOT ?= \"\" ;|INSTALLROOT = \"${STAGEDIR}\" ;|" \
 		${WRKSRC}/Jamsettings
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/server/Jamfile
 
 do-build:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG}
 
 do-install:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG} install
 
 .include <bsd.port.post.mk>