diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index cb56a01957a4..c7b004f448d5 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	anubis
 PORTVERSION=	4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	GNU
 
@@ -13,7 +13,8 @@ COMMENT=	Outgoing SMTP mail processor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf charsetfix cpe makeinfo pkgconfig shebangfix
+USES=		autoreconf charsetfix cpe localbase makeinfo \
+		pkgconfig shebangfix
 CHARSETFIX_MAKEFILEIN=	gnulib.mk
 CPE_VENDOR=	gnu
 SHEBANG_FILES=	contrib/msg2smtp.pl
@@ -23,15 +24,14 @@ GNU_CONFIGURE=	yes
 INFO=		anubis
 PORTEXAMPLES=	1anubisrc 2anubisrc
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=		NLS EXAMPLES GUILE GNUPG GNUTLS GSASL \
-			LIBWRAP PCRE PAM SOCKS
+OPTIONS_DEFINE=		NLS EXAMPLES EMACS GUILE GNUPG GNUTLS \
+			GSASL LIBWRAP PCRE PAM SOCKS TEST
 OPTIONS_GROUP=		DB
 OPTIONS_GROUP_DB=	GDBM MYSQL PGSQL
 OPTIONS_DEFAULT=	GUILE GNUPG GNUTLS GSASL
+OPTIONS_EXCLUDE_aarch64=TEST
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
 
@@ -42,29 +42,38 @@ OPTIONS_EXCLUDE+=	LIBWRAP
 OPTIONS_EXCLUDE+=	PAM
 .endif
 
+EMACS_DESC=		Install EMACS lisp files (requires emacs)
+EMACS_USE=		EMACS=yes
+EMACS_CONFIGURE_ON=	--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/anubis
+EMACS_CONFIGURE_OFF=	--with-lispdir=no
+
 GDBM_DESC=		GDBM backend
 GDBM_IMPLIES=		GSASL
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 
-GNUPG_LIB_DEPENDS=	libgpgme.so:security/gpgme
+GNUPG_LIB_DEPENDS=	libgpgme.so:security/gpgme \
+			libgpg-error.so:security/libgpg-error
 GNUPG_CONFIGURE_WITH=	gpgme
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 GSASL_DESC=		GSASL support (required for databases)
 GSASL_LIB_DEPENDS=	libgsasl.so:security/gsasl
 GSASL_CONFIGURE_WITH=	gsasl
 
-GUILE_LIB_DEPENDS=	libguile.so:lang/guile
+GUILE_LIB_DEPENDS=	libltdl.so:devel/libltdl \
+			libguile.so:lang/guile \
+			libgmp.so:math/gmp
 GUILE_CONFIGURE_WITH=	guile
 GUILE_PORTEXAMPLES=	anubis.scm anubisrc.guile
 
 LIBWRAP_CONFIGURE_WITH=	tcp-wrappers
 
 MYSQL_IMPLIES=		GSASL
-MYSQL_USE=		MYSQL=yes
+MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_VARS=		REQUIRE+=mysql
 
@@ -94,6 +103,9 @@ SUB_LIST+=	REQUIRE="${REQUIRE}"
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/src/headers.h
 
+post-patch-TEST-off:
+	@${REINPLACE_CMD} -e 's| testsuite||' ${WRKSRC}/Makefile.am
+
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*rc ${STAGEDIR}${EXAMPLESDIR}
diff --git a/mail/anubis/files/patch-configure.ac b/mail/anubis/files/patch-configure.ac
index 848946f6836e..2026a8db65cd 100644
--- a/mail/anubis/files/patch-configure.ac
+++ b/mail/anubis/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- ./configure.ac.orig	2008-12-16 11:21:54.000000000 -0500
-+++ ./configure.ac	2011-02-09 20:52:34.000000000 -0500
-@@ -78,7 +78,6 @@
+--- configure.ac.orig	2014-05-23 20:25:28 UTC
++++ configure.ac
+@@ -78,7 +78,6 @@ AH_BOTTOM([
  ])
  
  AC_CHECK_LIB(socket, socket)
@@ -8,7 +8,7 @@
  
  AC_SUBST(ADD_INCLUDES)
  case $build in
-@@ -179,11 +178,21 @@
+@@ -179,11 +178,21 @@ MU_CHECK_GSASL(0.2.3, [
      ANUBIS_BIN_ADM='$(adm_bin_programs)'
      M4_DEFS="$M4_DEFS -DWITH_GSASL"
  
@@ -31,7 +31,7 @@
  
      AC_ARG_WITH(mysql,
  	AC_HELP_STRING([--with-mysql],
-@@ -285,8 +294,8 @@
+@@ -285,8 +294,8 @@ AC_ARG_WITH(pam,
  	[with_pam=no])
  if test "$with_pam" = "yes"; then
   AC_CHECK_LIB(pam, main,, with_pam=no)
@@ -42,7 +42,7 @@
  fi
  if test "$with_pam" = "yes"; then
   AC_MSG_RESULT([Enabling PAM support...])
-@@ -300,7 +309,6 @@
+@@ -300,7 +309,6 @@ AC_ARG_WITH(tcp-wrappers,
  	[with_tcp_wrappers=no])
  if test "$with_tcp_wrappers" = "yes"; then
   AC_CHECK_LIB(wrap, main,, with_tcp_wrappers=no)
diff --git a/mail/anubis/files/patch-src__env.c b/mail/anubis/files/patch-src_env.c
similarity index 52%
rename from mail/anubis/files/patch-src__env.c
rename to mail/anubis/files/patch-src_env.c
index db2608efdf04..ab785c8c4c14 100644
--- a/mail/anubis/files/patch-src__env.c
+++ b/mail/anubis/files/patch-src_env.c
@@ -1,6 +1,6 @@
---- ./src/env.c.orig	2008-12-16 16:44:38.000000000 -0500
-+++ ./src/env.c	2011-02-09 20:52:34.000000000 -0500
-@@ -32,7 +32,7 @@
+--- src/env.c.orig	2014-05-17 20:26:43 UTC
++++ src/env.c
+@@ -30,7 +30,7 @@
  #ifdef HAVE_PAM
  pam_handle_t *pamh;
  static struct pam_conv conv = {
diff --git a/mail/anubis/files/patch-src__headers.h b/mail/anubis/files/patch-src_headers.h
similarity index 88%
rename from mail/anubis/files/patch-src__headers.h
rename to mail/anubis/files/patch-src_headers.h
index 107cd74d50a5..278a67f1ae19 100644
--- a/mail/anubis/files/patch-src__headers.h
+++ b/mail/anubis/files/patch-src_headers.h
@@ -1,5 +1,5 @@
---- ./src/headers.h.orig	2008-12-16 11:21:54.000000000 -0500
-+++ ./src/headers.h	2011-02-09 20:52:34.000000000 -0500
+--- src/headers.h.orig	2014-05-22 05:42:44 UTC
++++ src/headers.h
 @@ -43,11 +43,11 @@
  #   define HAVE_PCRE
  #  endif /* HAVE_PCRE_H or HAVE_PCRE_PCRE_H */
diff --git a/mail/anubis/pkg-plist b/mail/anubis/pkg-plist
index 02f0260462d4..3340f18eafbc 100644
--- a/mail/anubis/pkg-plist
+++ b/mail/anubis/pkg-plist
@@ -6,6 +6,8 @@ man/man1/anubis.1.gz
 %%GUILE%%share/anubis/entire-msg.scm
 %%GUILE%%share/anubis/remailer.scm
 %%GUILE%%share/anubis/rot-13.scm
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/anubis/anubis-mode.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/anubis/anubis-mode.elc
 %%NLS%%share/locale/da/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/de/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/es/LC_MESSAGES/anubis.mo