diff --git a/CMR/build.xml b/CMR/build.xml
index 476db11bb..ae859ecb2 100644
--- a/CMR/build.xml
+++ b/CMR/build.xml
@@ -304,32 +304,44 @@
 		<delete file="${build.scripts}/startup.bat" failonerror="false" />
 	</target>
 
-	<target name="generate-configuration-xsd-schema" depends="init,init-jaxb-schemagen">
+	<target name="generate-configuration-xsd-schema" depends="init,init-jaxb-schemagen,release-commonscs">
 		<jaxb-schemagen jaxb-schemagen.src="${src.commonscs}/info/novatec/inspectit/cmr/property/configuration" jaxb-schemagen.dest="${basedir}/config/schema" jaxb-schemagen.excludes="validation/**" jaxb-schemagen.schemafilename="configurationSchema.xsd">
 			<jaxb-schemagen.classpath>
+				<path refid="lib.prod.commons" />
 				<path refid="lib.prod.commonscs" />
+				<pathelement path="${build.commons.classes}" />
+				<pathelement path="${build.commonscs.classes}" />
 			</jaxb-schemagen.classpath>
 		</jaxb-schemagen>
 		<jaxb-schemagen jaxb-schemagen.src="${src.commonscs}/info/novatec/inspectit/cmr/property/update" jaxb-schemagen.dest="${basedir}/config/schema" jaxb-schemagen.excludes="" jaxb-schemagen.schemafilename="configurationUpdateSchema.xsd">
 			<jaxb-schemagen.classpath>
+				<path refid="lib.prod.commons" />
 				<path refid="lib.prod.commonscs" />
+				<pathelement path="${build.commons.classes}" />
+				<pathelement path="${build.commonscs.classes}" />
 			</jaxb-schemagen.classpath>
 		</jaxb-schemagen>
 	</target>
 
-	<target name="check-for-xsd-schema-correctness" depends="init,init-jaxb-schemagen">
+	<target name="check-for-xsd-schema-correctness" depends="init,init-jaxb-schemagen,release-commonscs">
 		<property name="build.configTempDir" value="${build.root}/temp/config/schema" />
 		<mkdir dir="${build.configTempDir}" />
 
 		<!-- Build temp schema files -->
 		<jaxb-schemagen jaxb-schemagen.src="${src.commonscs}/info/novatec/inspectit/cmr/property/configuration" jaxb-schemagen.dest="${build.configTempDir}" jaxb-schemagen.excludes="validation/**" jaxb-schemagen.schemafilename="configurationSchema.xsd">
 			<jaxb-schemagen.classpath>
+				<path refid="lib.prod.commons" />
 				<path refid="lib.prod.commonscs" />
+				<pathelement path="${build.commons.classes}" />
+				<pathelement path="${build.commonscs.classes}" />
 			</jaxb-schemagen.classpath>
 		</jaxb-schemagen>
 		<jaxb-schemagen jaxb-schemagen.src="${src.commonscs}/info/novatec/inspectit/cmr/property/update" jaxb-schemagen.dest="${build.configTempDir}" jaxb-schemagen.excludes="" jaxb-schemagen.schemafilename="configurationUpdateSchema.xsd">
 			<jaxb-schemagen.classpath>
+				<path refid="lib.prod.commons" />
 				<path refid="lib.prod.commonscs" />
+				<pathelement path="${build.commons.classes}" />
+				<pathelement path="${build.commonscs.classes}" />
 			</jaxb-schemagen.classpath>
 		</jaxb-schemagen>
 
diff --git a/Commons/resources/shared/build/common-targets.xml b/Commons/resources/shared/build/common-targets.xml
index 7081c897a..2c60f7b7d 100644
--- a/Commons/resources/shared/build/common-targets.xml
+++ b/Commons/resources/shared/build/common-targets.xml
@@ -74,12 +74,16 @@
 	<target name="init-jaxb-schemagen" depends="init-antcontrib">
 		<ivy:settings file="${ivy.settings.file}" />
 		<!-- needed for TestNG & Cobertura -->
-		<ivy:cachepath pathid="path.jaxb-schemagen" organisation="sun-jaxb" module="jaxb-xjc" revision="2.2" conf="default" inline="true" />
-		<ivy:cachepath pathid="path.jaxb-impl" organisation="sun-jaxb" module="jaxb-impl" revision="2.2" conf="default" inline="true" />
+		<ivy:cachepath pathid="path.jaxb-jxc" organisation="com.sun.xml.bind" module="jaxb-jxc" revision="2.2.11" conf="default" inline="true" />
+		<ivy:cachepath pathid="path.jaxb-xjc" organisation="com.sun.xml.bind" module="jaxb-xjc" revision="2.2.11" conf="default" inline="true" />
+		<ivy:cachepath pathid="path.jaxb-impl" organisation="com.sun.xml.bind" module="jaxb-impl" revision="2.2.11" conf="default" inline="true" />
+		<ivy:cachepath pathid="path.jaxb-core" organisation="com.sun.xml.bind" module="jaxb-core" revision="2.2.11" conf="default" inline="true" />
 
 		<path id="ant-jaxb-schemagen.classpath">
-			<path refid="path.jaxb-schemagen" />
+			<path refid="path.jaxb-jxc" />
+			<path refid="path.jaxb-xjc" />
 			<path refid="path.jaxb-impl" />
+			<path refid="path.jaxb-core" />
 		</path>
 
 		<classloader classpathref="ant-jaxb-schemagen.classpath" parentFirst="false" />