diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
index 6590c3b4a7ca..04c80313e203 100644
--- a/mail/mu4e/Makefile
+++ b/mail/mu4e/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	mu4e
-PORTVERSION=	1.6.10
-PORTREVISION=	2
+PORTVERSION=	1.8.13
+DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Emacs frontend for Mu
-WWW=		http://www.djcbsoftware.nl/code/mu/
+WWW=		https://www.djcbsoftware.nl/code/mu/
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	mu:mail/mu
 
 USES=		autoreconf emacs makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_PROJECT=	mu
 GH_ACCOUNT=	djcb
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk \
-		--disable-webkit \
-		--disable-guile \
+CONFIGURE_ARGS=	--disable-guile \
+		--disable-readline \
 		--docdir="${DOCSDIR}" \
 		--enable-mu4e
 INFO=		${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_TARGET=	install-strip
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SUB=		yes
 
 post-extract:
 	${INSTALL_DATA} ${WRKSRC}/mu4e/obsolete/org-mu4e.el \
 	    ${WRKSRC}/mu4e/org-mu4e.el
 
 pre-build:
 	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
 	    ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
 	    >> ${BUILD_WRKSRC}/Makefile
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
 	    ${GZIP_CMD} *.el
 
 .include <bsd.port.mk>
diff --git a/mail/mu4e/distinfo b/mail/mu4e/distinfo
index 42f98ab0b906..d673f70428d6 100644
--- a/mail/mu4e/distinfo
+++ b/mail/mu4e/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651756245
-SHA256 (djcb-mu-1.6.10_GH0.tar.gz) = 0d76f4111d4f60c7f148b0961d6aac72965ad677cf819972debaf833298c9d01
-SIZE (djcb-mu-1.6.10_GH0.tar.gz) = 2336687
+TIMESTAMP = 1672775272
+SHA256 (djcb-mu-v1.8.13_GH0.tar.gz) = bb95143f6b153637c3d2551b81d82a04fea0227aa470df863abfa4e2b6474e7e
+SIZE (djcb-mu-v1.8.13_GH0.tar.gz) = 734397
diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac
index 3b82e84a1ce3..2a4aa63073f4 100644
--- a/mail/mu4e/files/patch-configure.ac
+++ b/mail/mu4e/files/patch-configure.ac
@@ -1,124 +1,122 @@
---- configure.ac.orig	2021-08-21 13:27:15 UTC
+--- configure.ac.orig	2022-12-06 08:23:41 UTC
 +++ configure.ac
-@@ -34,13 +34,13 @@ AC_SUBST(prefix)
+@@ -34,11 +34,11 @@ AC_SUBST(prefix)
  
  # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
  # when a c++ compiler is not found. Weird, huh?
 -AC_PROG_CXX
 -AC_PROG_CC
 -AC_PROG_CPP
--AC_PROG_CC_STDC
--AC_PROG_CC_C99
 +#AC_PROG_CXX
 +#AC_PROG_CC
 +#AC_PROG_CPP
-+#AC_PROG_CC_STDC
-+#AC_PROG_CC_C99
  AC_PROG_INSTALL
--AC_HEADER_STDC
-+#AC_HEADER_STDC
+-AC_CHECK_INCLUDES_DEFAULT
++#AC_CHECK_INCLUDES_DEFAULT
+ AC_PROG_EGREP
  
- extra_flags="-Wformat-security                                        \
-          -Wstack-protector                                        \
-@@ -48,22 +48,22 @@ extra_flags="-Wformat-security                        
-          -Wno-cast-function-type                                  \
-          -Wno-bad-function-cast"
  
--AX_CXX_COMPILE_STDCXX_14
+@@ -49,22 +49,22 @@ extra_flags="-Wformat-security		\
+          -Wno-bad-function-cast		\
+ 	 -Wno-switch-enum"
+ 
+-AX_CXX_COMPILE_STDCXX_17
 -AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
--AX_APPEND_COMPILE_FLAGS([-Wno-inline ],[CXXFLAGS])
+-AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS])
 -AX_VALGRIND_CHECK
-+#AX_CXX_COMPILE_STDCXX_14
++#AX_CXX_COMPILE_STDCXX_17
 +#AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
-+#AX_APPEND_COMPILE_FLAGS([-Wno-inline ],[CXXFLAGS])
++#AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS])
 +#AX_VALGRIND_CHECK
  
 -LT_INIT
 +#LT_INIT
  
  AX_CODE_COVERAGE
  
  AC_PROG_AWK
  AC_CHECK_PROG(SORT,sort,sort)
  
 -AC_CHECK_HEADERS([wordexp.h])
 +#AC_CHECK_HEADERS([wordexp.h])
  
  # use the 64-bit versions
 -AC_SYS_LARGEFILE
 +#AC_SYS_LARGEFILE
  
  # asan is somewhat similar to valgrind, but has low enough overhead so it
  # can be used during normal operation.
-@@ -144,43 +144,13 @@ AS_IF([test -z "$PKG_CONFIG"],
+@@ -143,43 +143,13 @@ AS_IF([test -z "$PKG_CONFIG"],
  )
  
  # glib2?
--PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.50 gobject-2.0 gio-2.0)
+-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
 -glib_version="$($PKG_CONFIG --modversion glib-2.0)"
-+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.50 gobject-2.0 gio-2.0)
++# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
 +# glib_version="$($PKG_CONFIG --modversion glib-2.0)"
  
  # gmime, version 3.0 or higher
 -PKG_CHECK_MODULES(GMIME,gmime-3.0)
 -gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
 +# PKG_CHECK_MODULES(GMIME,gmime-3.0)
 +# gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
  
 -# xapian checking - we need 1.4 at least
 -PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
 -  have_xapian=yes
 -  xapian_version=$($PKG_CONFIG xapian-core --modversion)
 -  AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
 -],[
 -  # fall back to the xapian-config script. Not sure if there are cases where the
 -  # pkgconfig does not work, but xapian-config does, so keep this for now.
 -  AC_MSG_NOTICE([falling back to xapian-config])
 -  AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
 -  AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
 -     AC_MSG_ERROR([
 -     *** xapian could not be found; please install it
 -     *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
 -     *** If you compiled it yourself, you should ensure that xapian-config
 -     *** is in your PATH.])],
 -     [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
 -
 -  AS_CASE([$xapian_version],
 -      [1.[[4-9]].[[0-9]]*],
 -    [AC_MSG_NOTICE([xapian $xapian_version found.])],
 -    [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
 -
 -  XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
 -  XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
 -  have_xapian="yes"
 -
 -  AC_SUBST(XAPIAN_CXXFLAGS)
 -  AC_SUBST(XAPIAN_LIBS)
 -])
  ###############################################################################
  # we set the set the version of the MuStore (Xapian database) layout
  # here; it will become part of the db name, so we can automatically
-@@ -272,23 +242,8 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
+@@ -247,24 +217,10 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
  
  AC_CONFIG_FILES([
  Makefile
 -mu/Makefile
 -lib/Makefile
 -lib/doxyfile
+-lib/thirdparty/Makefile
 -lib/utils/Makefile
+-lib/message/Makefile
 -lib/index/Makefile
  mu4e/Makefile
- mu4e/mu4e-meta.el
+ mu4e/mu4e-config.el
 -guile/Makefile
 -guile/mu/Makefile
 -guile/examples/Makefile
--guile/tests/Makefile
 -guile/scripts/Makefile
--toys/Makefile
--toys/mug/Makefile
 -man/Makefile
 -m4/Makefile
 -contrib/Makefile
  ])
- AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck])
+-AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck])
++# AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck])
+ 
+ AC_OUTPUT
  
diff --git a/mail/mu4e/pkg-plist b/mail/mu4e/pkg-plist
index 644ed1250cb1..e4e363322331 100644
--- a/mail/mu4e/pkg-plist
+++ b/mail/mu4e/pkg-plist
@@ -1,47 +1,51 @@
 %%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-bookmarks.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-bookmarks.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-config.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-config.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contacts.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contacts.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-folders.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-folders.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-helpers.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-helpers.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-search.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-search.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-server.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-server.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-utils.elc
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-update.el.gz
+%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-update.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view-common.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view-common.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view-gnus.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view-gnus.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view-old.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view-old.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
 %%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el.gz
 %%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc