diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 4c7819817d5..4828a315d2f 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.46 2004/12/20 10:35:35 alek Exp $
+# $OpenBSD: Makefile,v 1.47 2005/04/15 19:06:56 fgsch Exp $
 
 COMMENT=	"read/write/list/format DOS disks under Unix"
 
-DATE=		20040505
-DISTNAME=	mtools-3.9.9
+DATE=		20050317
+DISTNAME=	mtools-3.9.10
 PKGNAME=	${DISTNAME}.${DATE}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tux.org/pub/knaff/mtools/ \
@@ -19,15 +19,23 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 c 
+WANTLIB=		c
 
 USE_GMAKE=		Yes
 
-USE_X11=		Yes
-
-CONFIGURE_STYLE=	autoconf dest
+CONFIGURE_STYLE=	gnu dest
 SEPARATE_BUILD=		Simple
 
+FLAVORS=	no_x11
+FLAVOR?=
+
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS=		--with-x=no
+.else
+USE_X11=		Yes
+WANTLIB+=		ICE SM X11
+.endif
+
 pre-patch:
 	@ln -s . ${WRKSRC}/mtools
 
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index 762fdc05c96..a516530aab3 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,8 +1,8 @@
-MD5 (mtools-3.9.9-20040505.diff.gz) = 7dfaef9449c6654d4dec042475f134e2
-MD5 (mtools-3.9.9.tar.gz) = 3e68b857b4e1f3a6521d1dfefbd30a36
-RMD160 (mtools-3.9.9-20040505.diff.gz) = 2db68962d4bf5b581c78d8214b5500799e980711
-RMD160 (mtools-3.9.9.tar.gz) = df85452f062366b6581211a7669bc6a236545d83
-SHA1 (mtools-3.9.9-20040505.diff.gz) = 8e19b7d09bf09d82993626ff37d542e98ab3c663
-SHA1 (mtools-3.9.9.tar.gz) = 47551ee9331527fadaf174cf55952d5113443564
-SIZE (mtools-3.9.9-20040505.diff.gz) = 43201
-SIZE (mtools-3.9.9.tar.gz) = 322805
+MD5 (mtools-3.9.10-20050317.diff.gz) = d23a13ca51b280bbc241dc76d2858b22
+MD5 (mtools-3.9.10.tar.gz) = 19bc1f06e9c5865b8ad20b1ddd976f5f
+RMD160 (mtools-3.9.10-20050317.diff.gz) = 60d980eb01f92ffd5e2643cc11ea0bc0af4790e8
+RMD160 (mtools-3.9.10.tar.gz) = 5f701a7cfea146b867ed570e4abea9f0b7ff68bf
+SHA1 (mtools-3.9.10-20050317.diff.gz) = 4c21ee56f71a3db672184b4f0df7216c9730d792
+SHA1 (mtools-3.9.10.tar.gz) = 1992fd360dc1bb9717da028aa3d3afb17488bcd1
+SIZE (mtools-3.9.10-20050317.diff.gz) = 2670
+SIZE (mtools-3.9.10.tar.gz) = 387208
diff --git a/sysutils/mtools/pkg/PFRAG.no-no_x11 b/sysutils/mtools/pkg/PFRAG.no-no_x11
new file mode 100644
index 00000000000..6938ce41569
--- /dev/null
+++ b/sysutils/mtools/pkg/PFRAG.no-no_x11
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2005/04/15 19:06:56 fgsch Exp $
+bin/floppyd
+bin/floppyd_installtest
+@man man/man1/floppyd.1
+@man man/man1/floppyd_installtest.1
diff --git a/sysutils/mtools/pkg/PLIST b/sysutils/mtools/pkg/PLIST
index 5acb64c04ca..0e772de6ff9 100644
--- a/sysutils/mtools/pkg/PLIST
+++ b/sysutils/mtools/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.9 2004/11/18 23:36:12 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.10 2005/04/15 19:06:56 fgsch Exp $
+!%%no_x11%%
 bin/amuFormat.sh
-bin/floppyd
-bin/floppyd_installtest
 bin/lz
 bin/mattrib
 bin/mbadblocks
@@ -34,8 +33,6 @@ bin/mzip
 bin/tgz
 bin/uz
 @info info/mtools.info
-@man man/man1/floppyd.1
-@man man/man1/floppyd_installtest.1
 @man man/man1/mattrib.1
 @man man/man1/mbadblocks.1
 @man man/man1/mcat.1