diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index 3f72977ad05c..ea24731b8336 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	archiveopteryx
-PORTVERSION=	3.2.99.20160129
-PORTREVISION=	3
+PORTVERSION=	3.2.99.20170718
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -19,7 +19,7 @@ BROKEN_powerpc64=	Does not build: /bin/sh: clang: not found
 USE_GITHUB=	yes
 GH_ACCOUNT=	aox
 GH_PROJECT=	aox
-GH_TAGNAME=	e10c73a
+GH_TAGNAME=	f9c2e40
 
 USES=		perl5 ssl
 USE_PERL5=	build
diff --git a/mail/archiveopteryx-devel/distinfo b/mail/archiveopteryx-devel/distinfo
index 6bddfa0cc149..f71afc16affe 100644
--- a/mail/archiveopteryx-devel/distinfo
+++ b/mail/archiveopteryx-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aox-aox-3.2.99.20160129-e10c73a_GH0.tar.gz) = 293091eeab99f52ac8b20816e9e95964d37d7e82bd47d73c828942773075f3b8
-SIZE (aox-aox-3.2.99.20160129-e10c73a_GH0.tar.gz) = 1800386
+TIMESTAMP = 1504192469
+SHA256 (aox-aox-3.2.99.20170718-f9c2e40_GH0.tar.gz) = 49d1fff10e3e1a0fdf043458024dc39583903040f324d1918a895b3bc6f703ae
+SIZE (aox-aox-3.2.99.20170718-f9c2e40_GH0.tar.gz) = 1800008
diff --git a/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp b/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
deleted file mode 100644
index bb0f90c58bb5..000000000000
--- a/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/tlsthread.cpp.orig	2017-01-10 15:06:31 UTC
-+++ server/tlsthread.cpp
-@@ -93,7 +93,7 @@ void TlsThread::setup()
-     SSL_library_init();
- 
-     ctx = ::SSL_CTX_new( SSLv23_server_method() );
--    int options = SSL_OP_ALL
-+    long options = SSL_OP_ALL
-                   // also try to pick the same ciphers suites more often
-                   | SSL_OP_CIPHER_SERVER_PREFERENCE
-                   // and don't use SSLv2, even if the client wants to