diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 39a5689634de..15de8c596065 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -1,65 +1,66 @@
 PORTNAME=	wanderlust
 PORTVERSION=	2.15.9.b.${SNAPDATE}
 PORTREVISION=	1
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Mail and news system for Emacs
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
 		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
 		x-face-e21${EMACS_PKGNAMESUFFIX}>0:mail/x-face-e21@${EMACS_FLAVOR}
 RUN_DEPENDS=	emacs-w3m${EMACS_PKGNAMESUFFIX}>0:www/emacs-w3m@${EMACS_FLAVOR} \
 		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
-GH_TAGNAME=	638d089
+GH_TAGNAME=	a3847bf
 
 NO_ARCH=	yes
-SNAPDATE=	20220103
+SNAPDATE=	20220720
 
 MAKE_ARGS+=	EMACS=${EMACS_CMD} \
 		FLAGS="-batch -q -no-site-file" \
 		LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
 		INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \
+		PACKAGE_LISPDIR=NONE \
 		PIXMAPDIR=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/wl/icons
 
 INFO=		wl wl-ja
 PORTDATA=	ja.Emacs
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
 
 post-install:
 	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	${INSTALL_DATA} \
 		${WRKSRC}/elmo/elmo-shimbun.el \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl
 	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	${INSTALL} -d ${STAGEDIR}/${DOCSDIR}
 .for f in README* NEWS* doc/wl*.texi
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 	${INSTALL} -d ${STAGEDIR}/${EXAMPLESDIR}
 	(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "en ja" \
 		${STAGEDIR}${EXAMPLESDIR})
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/en/*.orig \
 		${STAGEDIR}${EXAMPLESDIR}/ja/*.orig
 
 .include <bsd.port.mk>
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index df84842ac96f..a14ba1909cb5 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641739891
-SHA256 (wanderlust-wanderlust-2.15.9.b.20220103-638d089_GH0.tar.gz) = 935e4ebe6c27554037d7594b8c6fea5e9384770cf93419fc49eb06225ac7cbd4
-SIZE (wanderlust-wanderlust-2.15.9.b.20220103-638d089_GH0.tar.gz) = 1175434
+TIMESTAMP = 1659811529
+SHA256 (wanderlust-wanderlust-2.15.9.b.20220720-a3847bf_GH0.tar.gz) = 5c3a060d65b7660c86bcafe8886a9704fe6a2c314c4916124b0dc4bc12383f0d
+SIZE (wanderlust-wanderlust-2.15.9.b.20220720-a3847bf_GH0.tar.gz) = 1175057