diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index b65d0278e3d132fbe3adcabac9b4ab898eaed703..cf8eb675b9615673f37becb45ace7a3323414133 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -126,7 +126,7 @@
     <copy file="${lib}/jfreechart/jfreechart-1.0.13.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/jython/jython.jar" todir="${dist.datastore_server.lib}" />
     <copy todir="${dist.datastore_server.lib}/jython-lib" >
-    	<fileset 	dir="${lib}/jython/Lib" />
+    	<fileset 	dir="${lib}/jython/jython-lib" />
     </copy>
     <copy file="${lib}/truezip/truezip.jar" todir="${dist.datastore_server.lib}" />
   </target>
diff --git a/datastore_server/resource/eclipse/Data Store Server.launch b/datastore_server/resource/eclipse/Data Store Server.launch
index 5252ca8159302b0a0371d0edf1b2424486687163..f4a22739a518ea019cada0f842b88f7825a07dd4 100644
--- a/datastore_server/resource/eclipse/Data Store Server.launch	
+++ b/datastore_server/resource/eclipse/Data Store Server.launch	
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="datastore_server"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="datastore_server"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea&#10;-Dpython.path=../libraries/jython/jython-lib"/>
+</launchConfiguration>
diff --git a/screening/resource/eclipse/screening Data Store Server.launch b/screening/resource/eclipse/screening Data Store Server.launch
index d93cc670e0fd66175076c85c917755901b1a8290..678c0d89efbe4a8eaa314d3e64ee77bc0050d5a3 100644
--- a/screening/resource/eclipse/screening Data Store Server.launch	
+++ b/screening/resource/eclipse/screening Data Store Server.launch	
@@ -9,5 +9,5 @@
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="screening"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M&#13;-ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M&#13;-ea&#10;-Dpython.path=../libraries/jython/jython-lib"/>
 </launchConfiguration>