diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index dc284b9ddd2e..8407d7057e64 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -1,66 +1,63 @@
 # Created by: jmz
 # $FreeBSD$
 
 PORTNAME=	mtools
 PORTVERSION=	4.0.10
 PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	mtools
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Collection of tools for manipulating MS-DOS files
 
 LICENSE=	GPLv3
 
 CONFLICTS_INSTALL=	multimarkdown-*
 
 USES=		gmake makeinfo tar:bzip2
 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}
 .else
 CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 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 \
 		's|^#define MT_SIZE_T size_t|#define MT_SIZE_T off_t|g' \
 		${WRKSRC}/llong.h
 	@${REINPLACE_CMD} -e 's|/etc/mtools.conf|${PREFIX}/etc/mtools.conf|g' \
 		${WRKSRC}/mformat.c
 .for f in mtools.5 mtools.texi
 	@${REINPLACE_CMD} -e 's|/usr/local/etc/|${PREFIX}/etc/|g' \
 		${WRKSRC}/${f}
 .endfor
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mtools.conf ${STAGEDIR}${PREFIX}/etc/mtools.conf.sample
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/mtools.conf ]; then \
-		cd ${STAGEDIR}${PREFIX}/etc && ${CP} -p mtools.conf.sample mtools.conf; \
-	fi
 
 .include <bsd.port.mk>
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index b45a4812ee80..417a4745d836 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -1,62 +1,60 @@
 bin/amuFormat.sh
 %%X11%%bin/floppyd
 %%X11%%bin/floppyd_installtest
 bin/mattrib
 bin/mbadblocks
 bin/mcat
 bin/mcd
 bin/mcheck
 bin/mclasserase
 bin/mcomp
 bin/mcopy
 bin/mdel
 bin/mdeltree
 bin/mdir
 bin/mdu
 bin/mformat
 bin/minfo
 bin/mkmanifest
 bin/mlabel
 bin/mmd
 bin/mmount
 bin/mmove
 bin/mpartition
 bin/mrd
 bin/mren
 bin/mshowfat
 bin/mtools
 bin/mtoolstest
 bin/mtype
 bin/mxtar
 bin/mzip
 %%X11%%man/man1/floppyd.1.gz
 %%X11%%man/man1/floppyd_installtest.1.gz
 man/man1/mattrib.1.gz
 man/man1/mbadblocks.1.gz
 man/man1/mcat.1.gz
 man/man1/mcd.1.gz
 man/man1/mclasserase.1.gz
 man/man1/mcopy.1.gz
 man/man1/mdel.1.gz
 man/man1/mdeltree.1.gz
 man/man1/mdir.1.gz
 man/man1/mdu.1.gz
 man/man1/mformat.1.gz
 man/man1/minfo.1.gz
 man/man1/mkmanifest.1.gz
 man/man1/mlabel.1.gz
 man/man1/mmd.1.gz
 man/man1/mmount.1.gz
 man/man1/mmove.1.gz
 man/man1/mpartition.1.gz
 man/man1/mrd.1.gz
 man/man1/mren.1.gz
 man/man1/mshowfat.1.gz
 man/man1/mtools.1.gz
 man/man1/mtoolstest.1.gz
 man/man1/mtype.1.gz
 man/man1/mzip.1.gz
 man/man5/mtools.5.gz
-@unexec if cmp -s %D/etc/mtools.conf %D/etc/mtools.conf.sample; then rm -f %D/etc/mtools.conf; fi
-etc/mtools.conf.sample
-@exec if [ ! -f %D/etc/mtools.conf ]; then cp %B/%f %D/etc/mtools.conf; fi
+@sample etc/mtools.conf.sample