diff --git a/datastore_server/.classpath b/datastore_server/.classpath
index cba20ea9f8029c2941f1a3ca0795b1b892498a8d..21c4e2e5e169b6a5db3f257d9bb26f6e623a1307 100644
--- a/datastore_server/.classpath
+++ b/datastore_server/.classpath
@@ -27,5 +27,9 @@
 	<classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/>
 	<classpathentry kind="lib" path="/libraries/cisd-args4j/cisd-args4j.jar" sourcepath="/libraries/cisd-args4j/cisd-args4j-src.zip"/>
 	<classpathentry kind="lib" path="/libraries/fast-md5/fast-md5.jar" sourcepath="/libraries/fast-md5/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/eodsql/eodsql.jar" sourcepath="/libraries/eodsql/eodsql_src.zip"/>
+	<classpathentry kind="lib" path="/libraries/jaxb/jaxb-api.jar" sourcepath="/libraries/jaxb/jaxb-api-src.zip"/>
+	<classpathentry kind="lib" path="/libraries/jaxb/jaxb-impl.jar"/>
+	<classpathentry kind="lib" path="/libraries/jaxb/jsr173_1.0_api.jar"/>
 	<classpathentry kind="output" path="targets/classes"/>
 </classpath>
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index f737354187d19a1e58dba7abeccf930d6e69fbf5..543a878138bf4dc3fcbef4c10f7d2b9e0fa52032 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -47,7 +47,7 @@
 				           value="datastore_server-plugins.jar cisd-base.jar cifex.jar jetty.jar jetty-util.jar 
                 	          servlet-api-2.5.jar log4j.jar activation.jar mail.jar spring.jar fast-md5.jar
                                   commons-codec.jar commons-lang.jar commons-io.jar commons-logging.jar 
-                	          commons-httpclient.jar" />
+                	          commons-httpclient.jar eodsql.jar jaxb-api.jar jaxb-impl.jar jsr173_1-0_api.jar" />
 				<attribute name="Version" value="${version.number}" />
 				<attribute name="Build-Number"
 				           value="${version.number} (r${revision.number},${clean.flag})" />