diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index a83a484ce390..49f66ede5e39 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,43 +1,45 @@
 PORTNAME=	mu
-PORTVERSION=	1.6.10
+PORTVERSION=	1.8.13
+DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mail searching frontend for Xapian
-WWW=		http://www.djcbsoftware.nl/code/mu/
+WWW=		https://www.djcbsoftware.nl/code/mu/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
 		libgmime-3.0.so:mail/gmime30 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libjson-glib-1.0.so:devel/json-glib
 
 USES=		autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
 		libtool makeinfo pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	djcb
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk --disable-mu4e
+CONFIGURE_ARGS=	--disable-mu4e
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS GUILE
+OPTIONS_DEFAULT=	DOCS GUILE
 OPTIONS_SUB=		yes
 
-GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
+GUILE_LIB_DEPENDS=	libguile-3.0.so:lang/guile
 GUILE_USE=		ldconfig=yes
 GUILE_CONFIGURE_ENABLE=	guile
 GUILE_INFO=		mu-guile
 
 post-install:
 	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
 	    ${STAGEDIR}${PREFIX}/bin
 
 post-install-GUILE-on:
 	${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
 	    ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/mail/mu/distinfo b/mail/mu/distinfo
index 4fae91da1d2d..2ce3ca9bf865 100644
--- a/mail/mu/distinfo
+++ b/mail/mu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651756073
-SHA256 (djcb-mu-1.6.10_GH0.tar.gz) = 0d76f4111d4f60c7f148b0961d6aac72965ad677cf819972debaf833298c9d01
-SIZE (djcb-mu-1.6.10_GH0.tar.gz) = 2336687
+TIMESTAMP = 1672749076
+SHA256 (djcb-mu-v1.8.13_GH0.tar.gz) = bb95143f6b153637c3d2551b81d82a04fea0227aa470df863abfa4e2b6474e7e
+SIZE (djcb-mu-v1.8.13_GH0.tar.gz) = 734397
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
index f63250a5ca99..4a3493b69771 100644
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -1,35 +1,36 @@
 bin/mu
 bin/mu-ask
 %%GUILE%%lib/libguile-mu.so
 %%GUILE%%lib/libguile-mu.so.0
 %%GUILE%%lib/libguile-mu.so.0.0.0
 man/man1/mu-add.1.gz
 man/man1/mu-cfind.1.gz
 man/man1/mu-easy.1.gz
 man/man1/mu-extract.1.gz
+man/man1/mu-fields.1.gz
 man/man1/mu-find.1.gz
 man/man1/mu-help.1.gz
 man/man1/mu-index.1.gz
 man/man1/mu-info.1.gz
 man/man1/mu-init.1.gz
 man/man1/mu-mkdir.1.gz
 man/man1/mu-remove.1.gz
 man/man1/mu-script.1.gz
 man/man1/mu-server.1.gz
 man/man1/mu-verify.1.gz
 man/man1/mu-view.1.gz
 man/man1/mu.1.gz
 man/man5/mu-bookmarks.5.gz
 man/man7/mu-query.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.org
-%%GUILE%%share/guile/site/2.2/mu.scm
-%%GUILE%%share/guile/site/2.2/mu/plot.scm
-%%GUILE%%share/guile/site/2.2/mu/script.scm
-%%GUILE%%share/guile/site/2.2/mu/stats.scm
+%%GUILE%%share/guile/site/3.0/mu.scm
+%%GUILE%%share/guile/site/3.0/mu/plot.scm
+%%GUILE%%share/guile/site/3.0/mu/script.scm
+%%GUILE%%share/guile/site/3.0/mu/stats.scm
 %%GUILE%%%%DATADIR%%/scripts/find-dups.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-hour.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm
 %%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm