diff --git a/sysutils/mtm/Makefile b/sysutils/mtm/Makefile
index d26296fee426..ceabfdf3d2cd 100644
--- a/sysutils/mtm/Makefile
+++ b/sysutils/mtm/Makefile
@@ -1,43 +1,48 @@
 PORTNAME=	mtm
-DISTVERSION=	1.2.0
-PORTREVISION=	1
+DISTVERSION=	1.2.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Terminal multiplexer focused on simplicity, compatibility and stability
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/README.rst
 
 # NB: ncurses 6.1 is required.
-USES=		localbase:ldflags
+USES=		localbase
 
 USE_CSTD=	gnu99
 USE_GITHUB=	yes
 GH_ACCOUNT=	deadpixi
 
-PLIST_FILES=	bin/mtm \
-		share/man/man1/mtm.1.gz
+MAKE_ENV=	DESTDIR="${DESTDIR}${PREFIX}"
 
-CFLAGS+=	-I${NCURSESINC}
-LDFLAGS+=	-L${NCURSESLIB} -ltinfow
+CFLAGS+=	-I${NCURSESINC} ${CPPFLAGS}
+LIBS+=		-L${NCURSESLIB} -ltinfow -lutil
 
+BINARY_ALIAS=	strip=true
+
+PLIST_FILES=	bin/mtm \
+		share/man/man1/mtm.1.gz
 PORTDATA=	mtm.ti
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/mtm.1 \
 		${STAGEDIR}${MAN1PREFIX}/share/man/man1/mtm.1
 	@${MKDIR} ${STAGEDIR}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mtm ${STAGEDIR}${PREFIX}/bin/mtm
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/mtm.ti ${STAGEDIR}${DATADIR}/mtm.ti
 
 .include <bsd.port.options.mk>
 
+.if make(makesum) || make(fetch) && "${NO_CHECKSUM}" == yes
+.else
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses:base
 .else
 USES+=		ncurses:port
 .endif
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/mtm/distinfo b/sysutils/mtm/distinfo
index a82128eb0673..944ac514b457 100644
--- a/sysutils/mtm/distinfo
+++ b/sysutils/mtm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572263257
-SHA256 (deadpixi-mtm-1.2.0_GH0.tar.gz) = 68f753f743fcd3d87f269011d4bbd3fed59cfcad710d7c7db98844e3e675c196
-SIZE (deadpixi-mtm-1.2.0_GH0.tar.gz) = 382469
+TIMESTAMP = 1633890760
+SHA256 (deadpixi-mtm-1.2.1_GH0.tar.gz) = 2ae05466ef44efa7ddb4bce58efc425617583d9196b72e80ec1090bd77df598c
+SIZE (deadpixi-mtm-1.2.1_GH0.tar.gz) = 383409
diff --git a/sysutils/mtm/files/patch-Makefile b/sysutils/mtm/files/patch-Makefile
deleted file mode 100644
index 3465ad3404e0..000000000000
--- a/sysutils/mtm/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	2019-08-06 13:35:52 UTC
-+++ Makefile
-@@ -1,18 +1,20 @@
- CC        ?= gcc
- CFLAGS    ?= -std=c99 -Wall -Wextra -pedantic -Os
-+CPPFLAGS  ?=
-+LDFLAGS   ?=
- FEATURES  ?= -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED
--HEADERS   ?=
--LIBPATH   ?=
- DESTDIR   ?= /usr/local
- MANDIR    ?= $(DESTDIR)/man/man1
- CURSESLIB ?= ncursesw
--LIBS      ?= -l$(CURSESLIB) -lutil
-+LIBRARIES ?= -l$(CURSESLIB) -lutil
- 
-+CPPFLAGS  += $(FEATURES)
-+LDFLAGS   += $(LIBRARIES)
-+
- all: mtm
- 
- mtm: vtparser.c mtm.c config.h
--	$(CC) $(CFLAGS) $(FEATURES) -o $@ $(HEADERS) vtparser.c mtm.c $(LIBPATH) $(LIBS)
--	strip -s mtm
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ vtparser.c mtm.c
- 
- config.h: config.def.h
- 	cp -i config.def.h config.h