diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 35a1958c9a1b..fab67fa574b7 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -1,63 +1,63 @@
 # "+=" and "?=" lines are for sharing this Makefile with japanese/exmh2.
 
 PORTNAME=	exmh
 PORTVERSION=	2.9.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES+=	mail tk
 # XXX: Standard SF fails with a hung download
 MASTER_SITES=	https://sourceforge.net/projects/${PORTNAME}/files/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER?=	cy@FreeBSD.org
 COMMENT?=	X11/TK based mail reader front end to MH
 WWW=		http://www.beedub.com/exmh/
 
 .if defined(JAPANESE_EXMH)
 RUN_DEPENDS=	wish8.0jp:japanese/tk80
 BUILD_DEPENDS=	tclsh8.0jp:japanese/tcl80
 WISH=		wish8.0jp
 TCLSH=		tclsh8.0jp
 .else
 USES=		cpe tk:86
 .endif
 
 # exmh is pretty useless without this, but it's not needed to build it.
 .if defined(JAPANESE_EXMH)
 RUN_DEPENDS+=	repl:japanese/mh
 .else
 RUN_DEPENDS+=	repl:mail/nmh
 SCRIPTS_ENV+=	USE_NMH=YES
 .endif
 
 # full mime support needs mmencode/mmdecode from metamail
 RUN_DEPENDS+=	mmencode:mail/metamail
 
 # Additionally, exmh will use the following ports if present:
 # lang/expect
 # textproc/glimpse
 # security/gnupg
 # security/pgp
 # security/pgp5
 # mail/faces
 # audio/rplay
 
 PLIST_SUB=	EXMH_VERSION=${PORTVERSION}
 
 NO_ARCH=	yes
 
 .if defined(JAPANESE_EXMH)
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
 		WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \
 		${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/build
 .else
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
 		WISH=${WISH} WRKSRC=${WRKSRC} \
 		${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/build
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${STAGEDIR}${PREFIX} \
 		WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install
 
 .include <bsd.port.mk>
diff --git a/mail/exmh2/files/patch-lib_exwin.tcl b/mail/exmh2/files/patch-lib_exwin.tcl
deleted file mode 100644
index c4e739d62e0a..000000000000
--- a/mail/exmh2/files/patch-lib_exwin.tcl
+++ /dev/null
@@ -1,35 +0,0 @@
---- lib/exwin.tcl.orig	2017-11-09 20:42:24.000000000 -0800
-+++ lib/exwin.tcl	2021-09-06 06:53:11.916007000 -0700
-@@ -101,12 +101,26 @@
- }
- 
- proc mscroll {bindtag num} {
--    bind $bindtag <Button-5> [list %W yview scroll $num units]
--    bind $bindtag <Button-4> [list %W yview scroll -$num units]
--    bind $bindtag <Shift-Button-5> [list %W yview scroll 1 units]
--    bind $bindtag <Shift-Button-4> [list %W yview scroll -1 units]
--    bind $bindtag <Control-Button-5> [list %W yview scroll 1 pages]
--    bind $bindtag <Control-Button-4> [list %W yview scroll -1 pages]
-+    # Prior to tcl 8.7a5:
-+    # bind $bindtag <Button-5> [list %W yview scroll $num units]
-+    # bind $bindtag <Button-4> [list %W yview scroll -$num units]
-+    # bind $bindtag <Shift-Button-5> [list %W yview scroll 1 units]
-+    # bind $bindtag <Shift-Button-4> [list %W yview scroll -1 units]
-+    # bind $bindtag <Control-Button-5> [list %W yview scroll 1 pages]
-+    # bind $bindtag <Control-Button-4> [list %W yview scroll -1 pages]
-+
-+    # tcl 8.7a5 and later. See
-+    # https://core.tcl-lang.org/tips/doc/trunk/tip/474.md for more info:
-+    bind $bindtag <MouseWheel> [ list tk::MouseWheel %W y %D [ expr 10/-$num ] pixels ]
-+    bind $bindtag <Shift-MouseWheel> { tk::MouseWheel %W y %D -10 pixels }
-+    bind $bindtag <Control-MouseWheel> { tk::MouseWheel %W y %D -1 pixels }
-+}
-+
-+
-+proc fmscroll {bindtag num} {
-+    bind $bindtag <MouseWheel> [ list tk::MouseWheel %W y %D [ expr 200/-$num ] units ]
-+    bind $bindtag <Shift-MouseWheel> { tk::MouseWheel %W y %D [expr 200/-10 ] units }
-+    bind $bindtag <Control-MouseWheel> { tk::MouseWheel %W y %D -1 units }
- }
- 
- 
diff --git a/mail/exmh2/files/patch-lib_fdisp.tcl b/mail/exmh2/files/patch-lib_fdisp.tcl
deleted file mode 100644
index 262d80a1cf8f..000000000000
--- a/mail/exmh2/files/patch-lib_fdisp.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/fdisp.tcl.orig	2017-11-09 20:42:24.000000000 -0800
-+++ lib/fdisp.tcl	2021-09-06 06:49:07.808426000 -0700
-@@ -254,7 +254,7 @@
- 
-     # Enable wheelscroll if desired
-     if {$exwin(wheelEnabled)} {
--        mscroll $fdisp(canvas) 1
-+        fmscroll $fdisp(canvas) 5
-     }
- 
-     # fdisp popup color hack