diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index f96846f1da42..97abb4b555a9 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	mtools
 PORTVERSION=	4.0.43
 CATEGORIES=	emulators
 MASTER_SITES=	GNU
 
 MAINTAINER=	skreuzer@FreeBSD.org
-COMMENT=	Collection of tools for manipulating MS-DOS files
+COMMENT=	Tools for manipulating MS-DOS disks and images
 WWW=		https://www.gnu.org/software/mtools/intro.html
 
 LICENSE=	GPLv3
 
 CONFLICTS_INSTALL=	multimarkdown
 
 USES=		gmake makeinfo tar:lz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_malloc_h=no
 CONFIGURE_ARGS=	--enable-xdf
 
 SUB_FILES=	pkg-message
 
 INFO=		mtools
 
 OPTIONS_DEFINE=	ICONV X11
 OPTIONS_DEFAULT=ICONV X11
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 LIB_DEPENDS+=	libiconv.so:converters/libiconv
 .else
 CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 USES+=		xorg
 USE_XORG=	x11 sm ice xau
 PLIST_SUB+=	X11=""
 .else
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=	X11="@comment "
 MAKE_ENV+=	WITHOUT_X11=yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LOCAL_CONF_FILE/s,/etc/default,${LOCALBASE}/etc,' \
 		${WRKSRC}/mtoolsPaths.h
 	@${REINPLACE_CMD} -e 's|^\(SAMPLE FILE\)$$|#\1|' \
 		${WRKSRC}/mtools.conf
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mtools.conf ${STAGEDIR}${PREFIX}/etc/mtools.conf.sample
 
 .include <bsd.port.mk>
diff --git a/emulators/mtools/files/patch-Makefile.in b/emulators/mtools/files/patch-Makefile.in
index 7172fd00b479..1c9d84b0e764 100644
--- a/emulators/mtools/files/patch-Makefile.in
+++ b/emulators/mtools/files/patch-Makefile.in
@@ -1,36 +1,40 @@
 --- Makefile.in.orig	2022-10-09 09:55:19 UTC
 +++ Makefile.in
-@@ -77,6 +77,9 @@ mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1
+@@ -72,11 +72,14 @@ INSTALL_INFO	= @INSTALL_INFO@
+ .SUFFIXES: .o .c
+ .SUFFIXES: .o .c
+ 
+-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1	\
++MAN1 = mattrib.1 mbadblocks.1 mcat.1	\
+ mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1	\
  minfo.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1	\
  mrd.1 mren.1 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1	\
  mzip.1
 +ifndef WITHOUT_X11
 +MAN1 += floppyd.1 floppyd_installtest.1
 +endif
  
  MAN1EXT = 1
  MAN1DIR	= $(DESTDIR)$(mandir)/man${MAN1EXT}
 @@ -119,7 +122,7 @@ privileges.c remap.c scsi_io.c scsi.c signal.c stream.
  swap.c unix2dos.s unixdir.c tty.c vfat.c mkmanifest.c			\
  @FLOPPYD_IO_SRC@ @XDF_IO_SRC@
  
 -SCRIPTS = mcheck mxtar uz tgz mcomp amuFormat.sh
 +SCRIPTS = mcheck mxtar mcomp amuFormat.sh
  
  LINKS=mattrib mcat mcd mcopy mdel mdeltree mdir mdu	\
  mformat minfo mlabel mmd mmount mmove mpartition mrd mren mtype	\
-@@ -264,11 +267,11 @@ install-links: $(DESTDIR)$(bindir)/mtools
+@@ -264,11 +267,9 @@ install-links: $(DESTDIR)$(bindir)/mtools
  install-scripts: $(DESTDIR)$(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	@for j in $(SCRIPTS) ; do \
 -		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
 +		$(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
  		echo $(DESTDIR)$(bindir)/$$j ; \
  	done
 -	rm -f $(DESTDIR)$(bindir)/lz
 -	cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
-+	#rm -f $(DESTDIR)$(bindir)/lz
-+	#cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
  
  install-man:
  	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
diff --git a/emulators/mtools/pkg-descr b/emulators/mtools/pkg-descr
index 45977f704ef8..5ab285231a70 100644
--- a/emulators/mtools/pkg-descr
+++ b/emulators/mtools/pkg-descr
@@ -1,3 +1,4 @@
-Mtools is a collection of utilities for accessing MS-DOS disks from Unix without
-mounting them. It supports Win95 style long file names, OS/2 Xdf disks, ZIP/JAZ
-disks, and 2m disks (store up to 1992k on a high density 3 1/2" disk).
+Mtools is a collection of utilities for accessing MS-DOS disks and file
+system images from Unix without mounting them.  It supports Win95-style
+long file names, OS/2 XDF-formatted disks, ZIP/JAZ disks, and 2MB disks
+(store up to 1992kB on a high-density 3.5" diskette).