diff --git a/assembly/features/org.eclipse.wst.feature/feature.xml b/assembly/features/org.eclipse.wst.feature/feature.xml
index d0c12acc8674318bd52d64b5638c579ea3c9953c..a23cebc666157db66d4aa0162a1e9a6b1aba363b 100644
--- a/assembly/features/org.eclipse.wst.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.feature/feature.xml
@@ -52,33 +52,6 @@
          id="org.wsdl4j.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.wst.common_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.ws_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.rdb_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_ui.feature"
-         version="0.0.0"/>
 
 
 
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index e1491a20fb06c0ad99afba231fd85a2f1ff8ab9a..0437c3ebc4cccfabf05d5bced45e926dc1d316e9 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -212,6 +212,36 @@
                 <include name="**/*.log.zip" />
             </fileset>
         </unzip>
+        
+        <!-- workaround: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 -->
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.common_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.server_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.server_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.xml_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.ws_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.web_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.rdb_ui.feature/feature.temp.folder" />
+        </copy>
+        
     </target>
 
     <target name="clean" unless="noclean">