diff --git a/.cvsignore b/.cvsignore
index 77e3f65..c0be868 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-mtools-3.9.8-20010604.diff.gz
-mtools-3.9.8.tar.bz2
+mtools-3.9.9.tar.bz2
diff --git a/mtools-3.9.6-config.patch b/mtools-3.9.6-config.patch
index 6afd55a..89e2a0c 100644
--- a/mtools-3.9.6-config.patch
+++ b/mtools-3.9.6-config.patch
@@ -1,6 +1,6 @@
 --- mtools-3.9.6/mtools.conf.fixes	Sun Jan  4 04:29:32 1998
 +++ mtools-3.9.6/mtools.conf	Wed Feb  9 11:41:36 2000
-@@ -1,22 +1,21 @@
+@@ -1,22 +1,25 @@
  # Example mtools.conf files.  Uncomment the lines which correspond to
  # your architecture and comment out the "SAMPLE FILE" line below
 -SAMPLE FILE
@@ -29,6 +29,10 @@
 -# drive n: file="/var/lib/dosemu/diskimage" offset=3840
 +# dosemu hdimage
 +drive n: file="/var/lib/dosemu/hdimage" offset=8832
++
++# # HPOJ (ptal-photod)
++mtools_skip_check=1
++drive p: file=":0" remote
  
  # # Atari ramdisk image
  # drive o: file="/tmp/atari_rd" offset=136
diff --git a/mtools-3.9.9-noargs.patch b/mtools-3.9.9-noargs.patch
new file mode 100644
index 0000000..c4c9176
--- /dev/null
+++ b/mtools-3.9.9-noargs.patch
@@ -0,0 +1,15 @@
+--- mtools-3.9.9/scripts/mcomp.noargs	2003-05-22 12:22:42.000000000 +0100
++++ mtools-3.9.9/scripts/mcomp	2003-05-22 13:09:05.000000000 +0100
+@@ -1,5 +1,12 @@
+ #!/bin/sh
+ 
++if [ $# -lt 2 ]; then
++  echo "usage: $0 [-bspanvmQT] [-D clash_option] sourcefile targetfile"
++  echo "       $0 [-bspanvmQT] [-D clash_option] sourcefile [ sourcefiles... ]"
++  echo "             targetdirectoryopy [-tnvm] MSDOSsourcefile"
++  exit 1
++fi
++
+ dosfile=$1
+ shift
+ 
diff --git a/mtools.spec b/mtools.spec
index eebaa06..bc13e96 100644
--- a/mtools.spec
+++ b/mtools.spec
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
-Version: 3.9.8
-Release: 7
+Version: 3.9.9
+Release: 4
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -9,8 +9,8 @@ Url: http://mtools.linux.lu/
 Buildroot: %{_tmppath}/mtools-%{version}-root
 Patch0: mtools-3.9.6-config.patch
 Patch1: mtools-3.9.6-paths.patch
-Patch2: mtools-3.9.8-20010604.diff.gz
 Patch3: mtools-3.9.7-bigdisk.patch
+Patch4: mtools-3.9.9-noargs.patch
 Prereq: /sbin/install-info
 
 %description
@@ -25,8 +25,8 @@ Mtools should be installed if you need to use MS-DOS disks.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .pl604
 %patch3 -p1 -b .big
+%patch4 -p1 -b .nooargs
 
 %build
 %configure
@@ -62,6 +62,19 @@ fi
 %{_infodir}/*
 
 %changelog
+* Sat Oct 25 2003 Tim Waugh <twaugh@redhat.com> 3.9.9-4
+- Rebuilt.
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu May 22 2003 Tim Waugh <twaugh@redhat.com> 3.9.9-2
+- Fix mcomp with no arguments (bug #91372).
+
+* Tue Mar 18 2003 Tim Waugh <twaugh@redhat.com> 3.9.9-1
+- 3.9.9.
+- Add config lines for hpoj photo-card access on drive P:.
+
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 1c26d14..03d45a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7727ac28ec3689225116799d3593fd28  mtools-3.9.8-20010604.diff.gz
-0f6bebc0def2d5fec979e00ad77f3206  mtools-3.9.8.tar.bz2
+6928ab4d6958118cde2060aee130b9e2  mtools-3.9.9.tar.bz2