diff --git a/bds/.classpath b/bds/.classpath
index 1d007e30a5a754eeb621d251ce07025863b87269..32e0c04b0484900f435fdf4cc2c6c8548ecea73f 100644
--- a/bds/.classpath
+++ b/bds/.classpath
@@ -14,7 +14,7 @@
 	<classpathentry kind="lib" path="/libraries/jmock/third-party-libs/objenesis-1.0.jar"/>
 	<classpathentry kind="lib" path="/libraries/log4j/log4j.jar" sourcepath="/libraries/log4j/src.zip"/>
 	<classpathentry kind="lib" path="/libraries/fast-md5/fast-md5.jar" sourcepath="/libraries/fast-md5/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/args4j/args4j.jar" sourcepath="/libraries/args4j/args4j-src.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/bds/source/java/ch/systemsx/cisd/bds/check/structure/Parameters.java b/bds/source/java/ch/systemsx/cisd/bds/check/structure/Parameters.java
index f493a09be35bb0db7a45f8c1d391fbbb28b9e558..2aa2d55c190876a701b4fc5d2262759aa9bf90f5 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/check/structure/Parameters.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/check/structure/Parameters.java
@@ -21,12 +21,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
-import org.kohsuke.args4j.ExampleMode;
-import org.kohsuke.args4j.Option;
-
+import ch.systemsx.cisd.args4j.Argument;
+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.bds.StringUtils;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.common.utilities.BuildAndEnvironmentInfo;