diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml
index df70378a042867cea3a01b0ba0e9b249cec9d54d..38c6a95bfc22d36d2023d3b5ff4ad72449d58a5b 100644
--- a/releng.wtpbuilder/scripts/dependency/build.xml
+++ b/releng.wtpbuilder/scripts/dependency/build.xml
@@ -228,27 +228,37 @@
         -->
 	</target>
 
-	<target name="installRepo">
-		<!-- 
-	    	We first unzip the repo, then use p2 directory app to install into the eclispe used 
-	    	for testing. 
-	    	-->
-		<!--
-	            We use the exec method for unzip, so we won't fail if a 
-	            prereq can not be unzipped for some reason. See 
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=283968 
-	       -->
-		<echo message="install repo for groupId: ${groupId}" />
-		<mkdir dir="${testroot}/repos/${groupId}" />
-		<exec dir="." executable="unzip">
-			<arg line="-o -qq ${local.cache.dir}/${dependency.file} -d ${testroot}/repos/${groupId}" />
-		</exec>
-		<!--
-	        <unzip
-	            dest="${install.destination}"
-	            src="${local.cache.dir}/${dependency.file}"
-	            overwrite="true" />
-	       -->
-	</target>
+       <target name="installRepo">
+              <dirname file="${ant.file}" property="dependency.dir" />
+
+              <copy tofile="${buildDirectory}/dependency.${groupId}.xml">
+                     <fileset dir="${dependency.dir}">
+                            <include name="template.xml" />
+                     </fileset>
+              </copy>
+              <replace file="${buildDirectory}/dependency.${groupId}.xml" value="${groupId}.">
+                     <replacetoken>@dependencyGroupId@</replacetoken>
+              </replace>
+              <replace file="${buildDirectory}/dependency.${groupId}.xml" value="${dependency.dir}">
+                     <replacetoken>@dependencyDir@</replacetoken>
+              </replace>
+              <replace file="${buildDirectory}/dependency.${groupId}.xml" value="${dependency.properties}">
+                     <replacetoken>@dependencyProperties@</replacetoken>
+              </replace>
+              <ant antfile="${buildDirectory}/dependency.${groupId}.xml" target="installRepo">
+                     <property name="install.destination" value="${install.destination}" />
+              </ant>
+
+              <!--
+            <delete failonerror="false">
+            <fileset dir=".">
+            <include name="${buildDirectory}/dependency.${groupId}.xml" />
+            </fileset>
+            </delete>
+        -->
+       </target>
+	
+	
+
 </project>
 
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index 8223fd6be2360c4212c39aaf216dc59887984a40..419067480a62aff0671ed78c0d11cca4fa9ed649 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -206,6 +206,37 @@
         </echo>
     </target>
 
+       <target name="installRepo">
+              <!-- 
+              We first unzip the repo, then use p2 directory app to install into the eclispe used 
+              for testing. 
+              -->
+              <!--
+                   We use the exec method for unzip, so we won't fail if a 
+                   prereq can not be unzipped for some reason. See 
+                   https://bugs.eclipse.org/bugs/show_bug.cgi?id=283968 
+              -->
+              <echo message="install repo for groupId: ${groupId}" />
+                     
+              <mkdir dir="${testRoot}/repos/${groupId}" />
+              <exec dir="." executable="unzip">
+                     <arg line="-o -qq ${local.cache.dir}/${dependency.file} -d ${testRoot}/repos/${groupId}" />
+              </exec>
+              <!--
+               <unzip
+                   dest="${install.destination}"
+                   src="${local.cache.dir}/${dependency.file}"
+                   overwrite="true" />
+              -->
+       	
+       	
+       	
+       	
+       	
+       	
+       </target>	
+	
+	
     <target
         name="cleanInstall"
         if="clean">