diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index d9bb20444fce..5f7c8ab9429b 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -3,7 +3,7 @@
 # Date released:		1 Jan 97
 # Whom:				Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.22 1997/12/26 04:51:00 peter Exp $
+# $Id: Makefile,v 1.23 1997/12/26 07:11:40 peter Exp $
 #
 
 DISTNAME=	exmh-2.0.1
@@ -11,9 +11,18 @@ CATEGORIES=	mail tk80
 MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/exmh/
 EXTRACT_SUFX=	.tar.Z
 
+PATCH_SITES=	http://www.sunlabs.com/~bwelch/exmh/patches/2.0.1/
+PATCHFILES=	folderNew.patch seditpost.patch extrasInit.patch
+# XXX newsgroups.patch is relative to a different directory
+
+.if defined(PATCH_DEBUG)
+PATCH_DIST_ARGS= -d ${WRKSRC}/lib -E ${PATCH_DIST_STRIP}
+.else
+PATCH_DIST_ARGS= -d ${WRKSRC}/lib --forward --quiet -E ${PATCH_DIST_STRIP}
+.endif
+
 MAINTAINER=	peter@FreeBSD.org
 
-# There are likely to be distributed patches again.
 DIST_SUBDIR=	${PKGNAME}
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo
index 449e1854f626..ac813af9b2b3 100644
--- a/mail/exmh2/distinfo
+++ b/mail/exmh2/distinfo
@@ -1 +1,4 @@
-MD5 (exmh-2.0.1/exmh-2.0.tar.Z) = e0149feead029e126ba25aef2646a26a
+MD5 (exmh-2.0.1/exmh-2.0.1.tar.Z) = e0149feead029e126ba25aef2646a26a
+MD5 (exmh-2.0.1/folderNew.patch) = 86cc61aa9033dc3a1a12c53f108e5a1a
+MD5 (exmh-2.0.1/seditpost.patch) = a3181a3878bb5705762b4f4954ea6c51
+MD5 (exmh-2.0.1/extrasInit.patch) = a9c9924e0b45da4beca954a86bf45e3d