diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 5bee2c2c2a79..35429fd1e401 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,102 +1,102 @@
 # Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
 
 PORTNAME=	w3m
 PORTVERSION=	0.5.3.${SNAPDATE}
 CATEGORIES+=	www
 
 MAINTAINER?=	nobutaka@FreeBSD.org
 COMMENT?=	Pager/text-based WWW browser
 
 LICENSE=	w3m
 LICENSE_NAME=	w3m
 LICENSE_FILE=	${WRKSRC}/doc/README
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_mips64=		fails to build: qemu: uncaught target signal 11 (Segmentation fault) - core dumped
 
 LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
 USES=		cpe iconv pkgconfig perl5 ssl
 USE_GITHUB=	yes
 
 CPE_VENDOR=	w3m_project
 
 GH_ACCOUNT=	tats
 GH_PROJECT=	w3m
-GH_TAGNAME=	456ec66
+GH_TAGNAME=	2b59b9e
 
 MAKE_JOBS_UNSAFE=	yes
-SNAPDATE=	20210905
+SNAPDATE=	20211026
 
 CONFLICTS?=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-img-0.5.*
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gc=${LOCALBASE} \
 		ac_cv_path_PERL=${PERL}
 CONFIGURE_ENV=	DEFS="-I${LOCALBASE}/include"
 
 DOCS_COMMON=	FAQ.html HISTORY MANUAL.html README README.cookie \
 		README.cygwin README.dict README.func README.img \
 		README.m17n README.mouse README.passwd README.pre_form \
 		README.siteconf README.tab STORY.html \
 		keymap.default keymap.lynx menu.default menu.submenu
 DOCS_DE=	FAQ.html MANUAL.html README.func
 DOCS_EN=	README.sixel
 DOCS_JP=	${DOCS_COMMON} README.SSL README.keymap \
 		README.mailcap README.menu README.migemo
 
 OPTIONS_DEFINE=	INLINE_IMAGE JAPANESE KEY_LYNX DOCS NLS
 INLINE_IMAGE_DESC=	Inline image support
 JAPANESE_DESC=		Japanese messages and migemo support
 KEY_LYNX_DESC=		Keymap like lynx browser
 OPTIONS_SUB=	yes
 
 INLINE_IMAGE_USES=	gnome xorg
 INLINE_IMAGE_USE=	xorg=x11 gnome=gtk20,gdkpixbuf2
 INLINE_IMAGE_CONFIGURE_ON=	--with-imagelib=gtk2 --enable-image=fb,x11
 INLINE_IMAGE_CONFIGURE_OFF=	--enable-image=no
 
 JAPANESE_CONFIGURE_ON=	--enable-japanese=U --with-migemo=yes
 
 KEY_LYNX_CONFIGURE_ON=	--with-keymap=lynx
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ON=	--enable-nls
 NLS_CONFIGURE_OFF=	--disable-nls
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MINLINE_IMAGE}
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lX11"
 .else
 # Don't use pkg-message
 PKGMESSAGE=	${NONEXISTENT}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|`\(expr\) \(.*\) : \(.*\)`|`\1 \\( \2 : \3 \\)`|' \
 		-e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC}/doc* -type f \! -name HISTORY \
 		-exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} +
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/w3m
 	@cd ${WRKSRC}/doc-jp; \
 	for i in ${DOCS_JP} ; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/ja/w3m/ ; \
 	done
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/de/w3m
 	@cd ${WRKSRC}/doc-de; \
 	for i in ${DOCS_DE} ; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/de/w3m/ ; \
 	done
 	@cd ${WRKSRC}/doc; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/w3m/; \
 	for i in ${DOCS_COMMON} ${DOCS_EN} ; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/w3m/ ; \
 	done
 	${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/man/ja/man1
 
 .include <bsd.port.mk>
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 7f9cdbf4ca70..ee2086be1f8e 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631336633
-SHA256 (tats-w3m-0.5.3.20210905-456ec66_GH0.tar.gz) = f1174fb76e1a33fa722cca1dbb5ed6132a8723a3af61f6cc66bf93d316b37a22
-SIZE (tats-w3m-0.5.3.20210905-456ec66_GH0.tar.gz) = 2304259
+TIMESTAMP = 1635669108
+SHA256 (tats-w3m-0.5.3.20211026-2b59b9e_GH0.tar.gz) = 455bd3516a3134e8a2c52ab3da8d270223573de24beafe80c08b17244a95c66f
+SIZE (tats-w3m-0.5.3.20211026-2b59b9e_GH0.tar.gz) = 2304659