diff --git a/mail/mblaze/Makefile b/mail/mblaze/Makefile
index 568b1ad932ad..92f52b39ec11 100644
--- a/mail/mblaze/Makefile
+++ b/mail/mblaze/Makefile
@@ -1,20 +1,24 @@
 PORTNAME=	mblaze
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4
+DISTVERSION=	1.1
 CATEGORIES=	mail
 
+# mexport: ensure mbox entries are separated by an empty line
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+PATCHFILES=	7d049328136b466a33279ced6e2de46e4a41a3ef.patch:-p1
+
 MAINTAINER=	loader@FreeBSD.org
 COMMENT=	Unix utilities to deal with Maildir
 
 LICENSE=	CC0-1.0 MIT PD
 LICENSE_COMB=	multi
 
 USES=		gmake perl5
 USE_GITHUB=	yes
 USE_PERL5=	test
 
 GH_ACCOUNT=	leahneukirchen
 MAKEFILE=	GNUmakefile
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/mail/mblaze/distinfo b/mail/mblaze/distinfo
index a36f17a43171..ad018598dead 100644
--- a/mail/mblaze/distinfo
+++ b/mail/mblaze/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1534418112
-SHA256 (leahneukirchen-mblaze-v0.4_GH0.tar.gz) = 83dffd7fe74fa871642e97db94e27c04506f746fa4d6ba2f95c1a880638d6e0c
-SIZE (leahneukirchen-mblaze-v0.4_GH0.tar.gz) = 85934
+TIMESTAMP = 1621264311
+SHA256 (leahneukirchen-mblaze-v1.1_GH0.tar.gz) = edd8cb86f667543e703dee58263b81c7e47744339d23ebbb6a43e75059ba93b1
+SIZE (leahneukirchen-mblaze-v1.1_GH0.tar.gz) = 97041
+SHA256 (7d049328136b466a33279ced6e2de46e4a41a3ef.patch) = f7dcc1e87d24783cba852c213ca27e3b36a70c2c50c004355d65ae1d561d912a
+SIZE (7d049328136b466a33279ced6e2de46e4a41a3ef.patch) = 1481
diff --git a/mail/mblaze/files/patch-GNUmakefile b/mail/mblaze/files/patch-GNUmakefile
index b0da1f4bf98b..85fd9b4cac18 100644
--- a/mail/mblaze/files/patch-GNUmakefile
+++ b/mail/mblaze/files/patch-GNUmakefile
@@ -1,35 +1,33 @@
---- GNUmakefile.orig	2018-08-15 15:16:45 UTC
+--- GNUmakefile.orig	2021-01-14 15:45:22 UTC
 +++ GNUmakefile
 @@ -15,9 +15,8 @@ LDLIBS=-liconv
  endif
  
  DESTDIR=
 -PREFIX=/usr/local
  BINDIR=$(PREFIX)/bin
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  
  ALL = maddr magrep mdate mdeliver mdirs mexport mflag mflow mgenmid mhdr minc mlist mmime mpick mscan msed mseq mshow msort mthread
  SCRIPT = mcolor mcom mless mmkdir mquote museragent
-@@ -58,16 +57,17 @@ install: FRC all
+@@ -57,14 +56,15 @@ install: FRC all
  		$(DESTDIR)$(MANDIR)/man1 \
  		$(DESTDIR)$(MANDIR)/man5 \
  		$(DESTDIR)$(MANDIR)/man7
 -	install -m0755 $(ALL) $(SCRIPT) $(DESTDIR)$(BINDIR)
 +	$(BSD_INSTALL_PROGRAM) $(ALL) $(DESTDIR)$(BINDIR)
 +	$(BSD_INSTALL_SCRIPT) $(SCRIPT) $(DESTDIR)$(BINDIR)
- 	ln -sf mless $(DESTDIR)$(BINDIR)/mnext
- 	ln -sf mless $(DESTDIR)$(BINDIR)/mprev
  	ln -sf mcom $(DESTDIR)$(BINDIR)/mbnc
  	ln -sf mcom $(DESTDIR)$(BINDIR)/mfwd
  	ln -sf mcom $(DESTDIR)$(BINDIR)/mrep
  	ln -sf mdeliver $(DESTDIR)$(BINDIR)/mrefile
 -	install -m0644 man/*.1 $(DESTDIR)$(MANDIR)/man1
 -	install -m0644 man/*.5 $(DESTDIR)$(MANDIR)/man5
 -	install -m0644 man/*.7 $(DESTDIR)$(MANDIR)/man7
 +	$(BSD_INSTALL_MAN) man/*.1 $(DESTDIR)$(MANDIR)/man1
 +	$(BSD_INSTALL_MAN) man/*.5 $(DESTDIR)$(MANDIR)/man5
 +	$(BSD_INSTALL_MAN) man/*.7 $(DESTDIR)$(MANDIR)/man7
  
  release:
  	VERSION=$$(git describe --tags | sed 's/^v//;s/-[^.]*$$//') && \
diff --git a/mail/mblaze/pkg-plist b/mail/mblaze/pkg-plist
index bc0c78931be1..4f229f35cd5a 100644
--- a/mail/mblaze/pkg-plist
+++ b/mail/mblaze/pkg-plist
@@ -1,61 +1,59 @@
 bin/maddr
 bin/magrep
 bin/mbnc
 bin/mcolor
 bin/mcom
 bin/mdate
 bin/mdeliver
 bin/mdirs
 bin/mexport
 bin/mflag
 bin/mflow
 bin/mfwd
 bin/mgenmid
 bin/mhdr
 bin/minc
 bin/mless
 bin/mlist
 bin/mmime
 bin/mmkdir
-bin/mnext
 bin/mpick
-bin/mprev
 bin/mquote
 bin/mrefile
 bin/mrep
 bin/mscan
 bin/msed
 bin/mseq
 bin/mshow
 bin/msort
 bin/mthread
 bin/museragent
 man/man1/maddr.1.gz
 man/man1/magrep.1.gz
 man/man1/mbnc.1.gz
 man/man1/mcom.1.gz
 man/man1/mdeliver.1.gz
 man/man1/mdirs.1.gz
 man/man1/mexport.1.gz
 man/man1/mflag.1.gz
 man/man1/mflow.1.gz
 man/man1/mfwd.1.gz
 man/man1/mgenmid.1.gz
 man/man1/mhdr.1.gz
 man/man1/minc.1.gz
 man/man1/mless.1.gz
 man/man1/mlist.1.gz
 man/man1/mmime.1.gz
 man/man1/mmkdir.1.gz
 man/man1/mpick.1.gz
 man/man1/mrefile.1.gz
 man/man1/mrep.1.gz
 man/man1/mscan.1.gz
 man/man1/msed.1.gz
 man/man1/mseq.1.gz
 man/man1/mshow.1.gz
 man/man1/msort.1.gz
 man/man1/mthread.1.gz
 man/man5/mblaze-profile.5.gz
 man/man7/mblaze.7.gz
 man/man7/mmsg.7.gz