diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 5401d30f1d999e3f27e2288d12da985f01aaf6b1..5f1d414c27170ca6d4ce9908c4e7376ccec794cb 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -265,6 +265,33 @@
                 <include name="**/*.log.zip" />
             </fileset>
         </unzip>
+        
+        
+        <!-- workaround: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 -->
+        <!-- and https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
+                dir="${buildDirectory}/features/org.eclipse.jst.enterprise_ui.feature/feature.temp.folder" />
+        </copy>
+
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
+                dir="${buildDirectory}/features/org.eclipse.jst.server_ui.feature/feature.temp.folder" />
+        </copy>
+
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
+                dir="${buildDirectory}/features/org.eclipse.wst.web_ui.feature/feature.temp.folder" />
+        </copy>
+
+        
+        
     </target>
 
     <target