diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 6adec8034cb..0e96ec8db5c 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,19 +1,19 @@
-# $OpenBSD: Makefile,v 1.37 2001/09/04 22:58:21 fgsch Exp $
+# $OpenBSD: Makefile,v 1.38 2002/10/05 19:09:26 fgsch Exp $
 
 COMMENT=	read/write/list/format DOS disks under Unix
 
-DATE=		20010819
+DATE=		20020203
 DISTNAME=	mtools-3.9.8
 PKGNAME=	mtools-3.9.8.${DATE}
 CATEGORIES=	sysutils
-NEED_VERSION=	1.406
-MASTER_SITES=	ftp://ftp.tux.org/pub/tux/knaff/mtools/
+MASTER_SITES=	http://www.tux.org/pub/knaff/mtools/ \
+		${HOMEPAGE}
 
 PATCHFILES=	mtools-3.9.8-${DATE}.diff.gz
 
 MAINTAINER=	Federico Schwindt <fgsch@openbsd.org>
 
-HOMEPAGE=	http://alain.knaff.linux.lu/mtools/
+HOMEPAGE=	http://mtools.linux.lu/
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index 69fff8d8b7c..cf23f7aa483 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,6 +1,6 @@
-MD5 (mtools-3.9.8-20010819.diff.gz) = 1cd2defef4561af7d43b0823425513ea
+MD5 (mtools-3.9.8-20020203.diff.gz) = f9c3197eb3326ac4945b01604c398389
 MD5 (mtools-3.9.8.tar.gz) = 383538ac2df83871ce18628e132fcb10
-RMD160 (mtools-3.9.8-20010819.diff.gz) = 669cc744c43a5983e85dc47f759544b8e780e4f7
+RMD160 (mtools-3.9.8-20020203.diff.gz) = 4f8ba8fde1692b2c6728be58f86bba954273f07c
 RMD160 (mtools-3.9.8.tar.gz) = 39ed57b8759b7e497dc56123e091fc0711349f59
-SHA1 (mtools-3.9.8-20010819.diff.gz) = ef196791c49adfd2bb84a4c0688bbaa4b5f44264
+SHA1 (mtools-3.9.8-20020203.diff.gz) = 0d18b6fb8d3f46bb5e15c61da2a7ce58e35537e3
 SHA1 (mtools-3.9.8.tar.gz) = 49ee66c671ff38983da8dc88dca354bba6b415ce
diff --git a/sysutils/mtools/patches/patch-precmd_c b/sysutils/mtools/patches/patch-precmd_c
new file mode 100644
index 00000000000..9a1fe0b0fc4
--- /dev/null
+++ b/sysutils/mtools/patches/patch-precmd_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-precmd_c,v 1.1 2002/10/05 19:09:26 fgsch Exp $
+--- precmd.c.orig	Sun May 20 15:18:13 2001
++++ precmd.c	Sat Oct  5 15:55:51 2002
+@@ -21,7 +21,7 @@ void precmd(struct device *dev)
+ 			exit(1);
+ 			break;
+ 		case 0: /* the son */
+-			execl("/bin/sh", "sh", "-c", dev->precmd, 0);
++			execl("/bin/sh", "sh", "-c", dev->precmd, (char *)NULL);
+ 			break;
+ 		default:
+ 			wait(&status);