diff --git a/datamover/.classpath b/datamover/.classpath
index 8bee08bbb635a8c01723d77fb5ac16b083404b32..a338958d394625f5c1b3e3cb8ac1f7c64ef6d3f3 100644
--- a/datamover/.classpath
+++ b/datamover/.classpath
@@ -8,12 +8,12 @@
 	<classpathentry kind="lib" path="/libraries/mail/mail.jar"/>
 	<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
-	<classpathentry kind="lib" path="/libraries/args4j/args4j.jar" sourcepath="/libraries/args4j/args4j-src.jar"/>
 	<classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/>
 	<classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/>
 	<classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/>
 	<classpathentry kind="lib" path="/libraries/jmock/third-party-libs/hamcrest-api-1.0.jar"/>
 	<classpathentry kind="lib" path="/libraries/jmock/third-party-libs/hamcrest-library-1.0.jar"/>
 	<classpathentry kind="lib" path="/libraries/restrictionchecker/restrictions.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/args4j"/>
 	<classpathentry kind="output" path="targets/classes"/>
 </classpath>
diff --git a/datamover/build/build.xml b/datamover/build/build.xml
index 2c7e86adca9706c47b17a1fc6ebb9936e2cb5959..ebcf8373cfb41657f8489ea8866ee8268b09b132 100644
--- a/datamover/build/build.xml
+++ b/datamover/build/build.xml
@@ -34,7 +34,7 @@
 			<manifest>
 				<attribute name="Main-Class" value="ch.systemsx.cisd.datamover.Main" />
 				<attribute name="Class-Path"
-                   value="log4j.jar args4j.jar commons-lang.jar commons-io.jar activation.jar mail.jar" />
+                   value="log4j.jar commons-lang.jar commons-io.jar activation.jar mail.jar" />
 				<attribute name="Version" value="${version.number}" />
 				<attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" />
 			</manifest>
@@ -45,7 +45,6 @@
 		<copy file="${lib}/activation/activation.jar" todir="${dist.datamover.lib}" />
 		<copy file="${lib}/mail/mail.jar" todir="${dist.datamover.lib}" />
 		<copy file="${lib}/log4j/log4j.jar" todir="${dist.datamover.lib}" />
-		<copy file="${lib}/args4j/args4j.jar" todir="${dist.datamover.lib}" />
 		<copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist.datamover.lib}" />
 		<copy file="${lib}/commons-io/commons-io.jar" todir="${dist.datamover.lib}" />
 		<property name="dist.file" value="${dist.file.prefix}-${version.number}-r${revision.number}.zip" />
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
index e72a7ce591dc26d26e8685eb37df3ec019c838fc..d064efeb76a4e5363855bd614f80e5ba76ccf387 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
@@ -27,14 +27,14 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang.time.DurationFormatUtils;
 import org.apache.log4j.Logger;
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
-import org.kohsuke.args4j.ExampleMode;
-import org.kohsuke.args4j.Option;
-import org.kohsuke.args4j.spi.LongOptionHandler;
-import org.kohsuke.args4j.spi.OptionHandler;
-import org.kohsuke.args4j.spi.Setter;
 
+import ch.systemsx.cisd.args4j.CmdLineException;
+import ch.systemsx.cisd.args4j.CmdLineParser;
+import ch.systemsx.cisd.args4j.ExampleMode;
+import ch.systemsx.cisd.args4j.Option;
+import ch.systemsx.cisd.args4j.spi.LongOptionHandler;
+import ch.systemsx.cisd.args4j.spi.OptionHandler;
+import ch.systemsx.cisd.args4j.spi.Setter;
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
 import ch.systemsx.cisd.common.exceptions.HighLevelException;
 import ch.systemsx.cisd.common.highwatermark.FileWithHighwaterMark;
@@ -821,23 +821,25 @@ public final class Parameters implements ITimingParameters, IFileSysParameters
         @Override
         public final void set(final long value) throws CmdLineException
         {
-            setter.addValue(toMillis(value));
+            super.set(toMillis(value));
         }
 
     }
 
     public final static class FileWithHighwaterMarkHandler extends
-            OptionHandler<FileWithHighwaterMark>
+            OptionHandler
     {
-
         static final char SEP = ':';
 
+        private final Setter<? super FileWithHighwaterMark> setter;
+
         private String argument;
 
         public FileWithHighwaterMarkHandler(final Option option,
                 final Setter<FileWithHighwaterMark> setter)
         {
-            super(option, setter);
+            super(option);
+            this.setter = setter;
         }
 
         //
@@ -851,7 +853,7 @@ public final class Parameters implements ITimingParameters, IFileSysParameters
         }
 
         @Override
-        public final int parseArguments(final org.kohsuke.args4j.spi.Parameters params)
+        public final int parseArguments(final ch.systemsx.cisd.args4j.spi.Parameters params)
                 throws CmdLineException
         {
             argument = params.getOptionName();