diff --git a/mail/mailfromd/Makefile b/mail/mailfromd/Makefile
index c6edb94e8481..d3824621804a 100644
--- a/mail/mailfromd/Makefile
+++ b/mail/mailfromd/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	mailfromd
 PORTVERSION=	9.0
 CATEGORIES=	mail
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
 
 MAINTAINER=	zeus@gnu.org.ua
 COMMENT=	Mail filtering daemon for Sendmail, Postfix, and MeTA1
 WWW=		https://puszcza.gnu.org.ua/software/mailfromd/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libmailutils.so:mail/mailutils \
 		libadns.so:dns/adns \
 		libgmp.so:math/gmp \
 		libgnutls.so:security/gnutls \
 		libnettle.so:security/nettle
 
 USES=		gmake localbase readline tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog-async
 CONFIGURE_ENV=	DEFAULT_STATE_DIR="${DATABASEDIR}" \
 		DEFAULT_SOCKET="unix:${MFD_RUN_DIR}/${PORTNAME}.sock" \
 		DEFAULT_USER=mailnull
 USE_RC_SUBR=	calloutd ${PORTNAME}
 TEST_TARGET=	check
 
 DATABASEDIR?=	/var/db/${PORTNAME}
 MFD_RUN_DIR?=	/var/run/${PORTNAME}
 
 PLIST_SUB+=	DATABASEDIR=${DATABASEDIR} \
 		MFD_RUN_DIR=${MFD_RUN_DIR} \
 		VERSION=${PORTVERSION}
 SUB_LIST+=	MFD_RUN_DIR=${MFD_RUN_DIR}
 
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS TODO
 
-OPTIONS_DEFINE=		DOCS DSPAM NLS
+OPTIONS_DEFINE=		DOCS EMACS NLS
 OPTIONS_DEFAULT=	GDBM
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	BDB GDBM
 OPTIONS_SUB=		yes
 
-BDB_DESC=		Berkeley DB v4.8 support (last working one)
+BDB_DESC=		Berkeley DB v4.8 (last working one) support
 DB_DESC=		Database configuration
 
-DSPAM_DESC=		DSPAM spam filter library support
-DSPAM_LIB_DEPENDS=	libdspam.so:mail/dspam
-DSPAM_USES=		pkgconfig
-DSPAM_CONFIGURE_WITH=	dspam
+EMACS_DESC=		Install Emacs Lisp *-mode files
+EMACS_CONFIGURE_ENV_OFF=ac_cv_prog_EMACS=no
+EMACS_USES=		emacs:build
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 BDB_USES=		bdb
 BDB_CONFIGURE_WITH=	berkeley-db
 BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
 BDB_LDFLAGS=		-L${BDB_LIB_DIR}
 
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e '/^install-lispLISP:/s,lisp_LISP,&) $$(&:.el=.elc,' \
+		${WRKSRC}/elisp/Makefile.in
 	@${REINPLACE_CMD} -e '/^mfmodnew_LDADD =/s,),& $$(INTLLIBS),' \
 		${WRKSRC}/mfmod/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATABASEDIR} ${STAGEDIR}${MFD_RUN_DIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mailfromd/pkg-plist b/mail/mailfromd/pkg-plist
index d75857c53106..c747490b1322 100644
--- a/mail/mailfromd/pkg-plist
+++ b/mail/mailfromd/pkg-plist
@@ -1,55 +1,59 @@
 bin/mfdbtool
 bin/mfmodnew
 bin/mtasim
 @sample etc/mailfromd.mfl.sample
 include/mailfromd/exceptions.h
 include/mailfromd/mfmod.h
 sbin/calloutd
 sbin/mailfromd
 share/aclocal/mfmod.m4
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/mfl-mode.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/mfl-mode.elc
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/obfemail-mode.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/obfemail-mode.elc
 %%NLS%%share/locale/da/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/mailfromd.mo
 %%DATADIR%%/%%VERSION%%/_register.mfl
 %%DATADIR%%/%%VERSION%%/callout.mfl
 %%DATADIR%%/%%VERSION%%/cdb.mfl
 %%DATADIR%%/%%VERSION%%/dkim.mfl
 %%DATADIR%%/%%VERSION%%/dns.mfl
 %%DATADIR%%/%%VERSION%%/email.mfl
 %%DATADIR%%/%%VERSION%%/gettext.mfl
 %%DATADIR%%/%%VERSION%%/header_rename.mfl
 %%DATADIR%%/%%VERSION%%/heloarg_test.mfl
 %%DATADIR%%/%%VERSION%%/include/pp-setup
 %%DATADIR%%/%%VERSION%%/is_ip.mfl
 %%DATADIR%%/%%VERSION%%/localdomain.mfl
 %%DATADIR%%/%%VERSION%%/match_cidr.mfl
 %%DATADIR%%/%%VERSION%%/match_dnsbl.mfl
 %%DATADIR%%/%%VERSION%%/match_rhsbl.mfl
 %%DATADIR%%/%%VERSION%%/milter.mfl
 %%DATADIR%%/%%VERSION%%/mime.mfl
 %%DATADIR%%/%%VERSION%%/poll.mfl
 %%DATADIR%%/%%VERSION%%/portprobe.mfl
 %%DATADIR%%/%%VERSION%%/rateok.mfl
 %%DATADIR%%/%%VERSION%%/revip.mfl
 %%DATADIR%%/%%VERSION%%/sa.mfl
 %%DATADIR%%/%%VERSION%%/safedb.mfl
 %%DATADIR%%/%%VERSION%%/sieve.mfl
 %%DATADIR%%/%%VERSION%%/sockmap.mfl
 %%DATADIR%%/%%VERSION%%/spf.mfl
 %%DATADIR%%/%%VERSION%%/status.mfl
 %%DATADIR%%/%%VERSION%%/strip_domain_part.mfl
 %%DATADIR%%/%%VERSION%%/syslog.mfl
 %%DATADIR%%/%%VERSION%%/valid_domain.mfl
 %%DATADIR%%/%%VERSION%%/verp.mfl
 %%DATADIR%%/mfmod/template.ac
 %%DATADIR%%/mfmod/template.am
 %%DATADIR%%/mfmod/template.c
 %%DATADIR%%/mfmod/template.mfl
 %%DATADIR%%/postfix-macros.sed
 @dir(mailnull,mail,700) %%DATABASEDIR%%
 @dir(mailnull,mail,700) %%MFD_RUN_DIR%%