diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index 46d6a8f8dda4..7d24b3ec5928 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/download/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 WWW=		https://www.archiveopteryx.org/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	jam:devel/jam
 
 USES=		compiler perl5 ssl tar:bzip2
 USE_PERL5=	build
 WITH_PGSQL=	client
 
 CONFLICTS_INSTALL=	archiveopteryx-devel # bin/aox bin/aoxdeliver bin/aoxexport bin/aoximport
 
 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
 JAMARG+=	-dx
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD with clang in base
 .if ${OPSYS} == FreeBSD
 .if ${CHOSEN_COMPILER_TYPE} == clang
 JAMARG+=	"-sCLANG=1"
 .endif
 .endif
 
 post-patch:
 	@${EGREP} -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
 .if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
 	@${REINPLACE_CMD} -e 's|-Werror|-Werror -DOPENSSL_API_COMPAT=0x10100000L|g' \
 		${WRKSRC}/Jamsettings
 .endif
 
 do-build:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG}
 
 do-install:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG} install
 
 .include <bsd.port.post.mk>
diff --git a/mail/archiveopteryx/files/patch-Jamsettings b/mail/archiveopteryx/files/patch-Jamsettings
index 82d3a6a9ad16..a0dee81024fb 100644
--- a/mail/archiveopteryx/files/patch-Jamsettings
+++ b/mail/archiveopteryx/files/patch-Jamsettings
@@ -1,53 +1,58 @@
---- Jamsettings.orig	2012-07-10 08:45:55.000000000 -0500
-+++ Jamsettings	2012-12-26 18:19:56.434350066 -0600
-@@ -12,7 +12,7 @@
+--- Jamsettings.orig	2014-03-10 13:44:59 UTC
++++ Jamsettings
+@@ -12,7 +12,7 @@ INSTALLROOT ?= "" ;
  
  # A convenient prefix used by most directory and file names,.
  #
 -PREFIX ?= /usr/local/archiveopteryx ;
 +PREFIX ?= %%PREFIX%% ;
  
  # The directory for user and sysadmin tools
  #
-@@ -28,32 +28,34 @@
+@@ -24,36 +24,38 @@ SBINDIR = $(PREFIX)/sbin ;
+ 
+ # The directory where the man pages are installed
+ #
+-MANDIR = $(PREFIX)/man ;
++MANDIR = $(PREFIX)/share/man ;
  
  # Supporting files
  #
 -LIBDIR = $(PREFIX)/lib ;
 +LIBDIR = $(PREFIX)/libexec/aox ;
-+
-+LIBDATADIR = $(PREFIX)/libdata/aox ;
  
++LIBDATADIR = $(PREFIX)/libdata/aox ;
++
  # The startup/shutdown script's directory
  #
 -INITDIR = $(LIBDIR) ;
 +INITDIR = $(PREFIX)/etc/rc.d ;
  
  # Where to write pid files for the servers
  #
 -PIDFILEDIR ?= $(PREFIX)/lib/pidfiles ;
 +PIDFILEDIR ?= /var/run/aox ;
  
  # The servers chroot to an empty, unreadable jail directory at
  # startup.
  #
 -JAILDIR = $(PREFIX)/jail ;
 +JAILDIR = /var/db/aox/jail ;
  
  # This is the default message-copy-directory.
  #
 -MESSAGEDIR = $(JAILDIR)/messages ;
 +MESSAGEDIR = /var/db/aox/messages ;
  
  # The directory where the configuration file is located.
  #
 -CONFIGDIR = $(PREFIX) ;
 +CONFIGDIR = $(PREFIX)/etc/archiveopteryx ;
  
  # The directory where the README and other files are installed.
  #
 -READMEDIR = $(PREFIX) ;
 +READMEDIR = $(PREFIX)/share/doc/archiveopteryx ;
  
  # The log file's default name. (This can be a file name or syslog/x,
  # where x is a facility.)
diff --git a/mail/archiveopteryx/pkg-plist b/mail/archiveopteryx/pkg-plist
index b29cac2c139d..52b672ec3067 100644
--- a/mail/archiveopteryx/pkg-plist
+++ b/mail/archiveopteryx/pkg-plist
@@ -1,24 +1,24 @@
 bin/aox
 bin/aoxdeliver
 bin/aoxexport
 bin/aoximport
 libdata/aox/downgrades
 libdata/aox/field-names
 libdata/aox/flag-names
 libdata/aox/fts.pg
 libdata/aox/schema.pg
 libexec/aox/contrib/rrdglue
 libexec/aox/installer
-man/man5/aoxsuper.conf.5.gz
-man/man5/archiveopteryx.conf.5.gz
-man/man8/aox.8.gz
-man/man8/aoxdeliver.8.gz
-man/man8/aoximport.8.gz
-man/man8/archiveopteryx.8.gz
-man/man8/installer.8.gz
-man/man8/logd.8.gz
-man/man8/recorder.8.gz
 sbin/archiveopteryx
 sbin/logd
 sbin/recorder
+share/man/man5/aoxsuper.conf.5.gz
+share/man/man5/archiveopteryx.conf.5.gz
+share/man/man8/aox.8.gz
+share/man/man8/aoxdeliver.8.gz
+share/man/man8/aoximport.8.gz
+share/man/man8/archiveopteryx.8.gz
+share/man/man8/installer.8.gz
+share/man/man8/logd.8.gz
+share/man/man8/recorder.8.gz
 @dir %%ETCDIR%%