diff --git a/mail/mu4e-maildirs/Makefile b/mail/mu4e-maildirs/Makefile
index b45b93f64748..9b714bb260f6 100644
--- a/mail/mu4e-maildirs/Makefile
+++ b/mail/mu4e-maildirs/Makefile
@@ -1,52 +1,51 @@
 PORTNAME=	mu4e-maildirs
-PORTVERSION=	0.8.20180606
-PORTREVISION=	3
+PORTVERSION=	0.8.20201028
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Maildirs extension for Mu4e
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
 RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		mu4e${EMACS_PKGNAMESUFFIX}>0:mail/mu4e@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-extension
 GH_ACCOUNT=	agpchil
-GH_TAGNAME=	3ef4c48
+GH_TAGNAME=	1167bc6
 
 NO_ARCH=	yes
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.elc \
 		${EMACS_SITE_LISPDIR}/mu4e/mu4e-maildirs-extension.el.gz
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	cd ${WRKSRC} && ${EMACS_CMD} --batch \
 	    --eval "(provide 'mu4e)" \
 	    --eval "(defvar mu4e~main-buffer-name \"tests\")" \
 	    --eval "(defvar mu4e-mu-binary \"mu\")" \
 	    --eval "(require 'cl)" \
 	    -l dash.el \
 	    -l mu4e-maildirs-extension.el \
 	    --eval "(byte-compile-file \"mu4e-maildirs-extension.el\")" && \
 	    ${GZIP_CMD} mu4e-maildirs-extension.el
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
 	    cd ${WRKSRC} && ${INSTALL_DATA} \
 	    mu4e-maildirs-extension.elc \
 	    mu4e-maildirs-extension.el.gz \
 	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	    cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mu4e-maildirs/distinfo b/mail/mu4e-maildirs/distinfo
index 7d065165763b..0893ac080698 100644
--- a/mail/mu4e-maildirs/distinfo
+++ b/mail/mu4e-maildirs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551677537
-SHA256 (agpchil-mu4e-maildirs-extension-0.8.20180606-3ef4c48_GH0.tar.gz) = 728fc351e86c021c663558f033876a295760f8bba595932ee28fb850dc37c1c6
-SIZE (agpchil-mu4e-maildirs-extension-0.8.20180606-3ef4c48_GH0.tar.gz) = 10805
+TIMESTAMP = 1629742120
+SHA256 (agpchil-mu4e-maildirs-extension-0.8.20201028-1167bc6_GH0.tar.gz) = fbd8f18ede3d95bdc1f81b48ae528dffc6bb6c11aff7ec4f4642b9cee4de2a92
+SIZE (agpchil-mu4e-maildirs-extension-0.8.20201028-1167bc6_GH0.tar.gz) = 10948
diff --git a/mail/mu4e-maildirs/files/patch-mu4e-maildirs-extension.el b/mail/mu4e-maildirs/files/patch-mu4e-maildirs-extension.el
new file mode 100644
index 000000000000..b577a817291b
--- /dev/null
+++ b/mail/mu4e-maildirs/files/patch-mu4e-maildirs-extension.el
@@ -0,0 +1,10 @@
+--- mu4e-maildirs-extension.el.orig	2020-10-28 09:21:07 UTC
++++ mu4e-maildirs-extension.el
+@@ -34,6 +34,7 @@
+ 
+ ;;; Code:
+ (require 'mu4e)
++(require 'mu4e-meta)
+ (require 'dash)
+ 
+ (defgroup mu4e-maildirs-extension nil