diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix ./releng/org.eclipse.linuxtools.releng-site/category.xml
--- ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix	2014-09-19 15:10:06.829195893 -0400
+++ ./releng/org.eclipse.linuxtools.releng-site/category.xml	2014-09-19 15:10:11.452260425 -0400
@@ -4,6 +4,7 @@
    <description url="http://download.eclipse.org/linuxtools/updates-nightly">
       Nightly builds of Linux Tools project.
    </description>
+   <!--
    <feature url="features/org.eclipse.linuxtools.cdt.libhover.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.feature" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
@@ -16,6 +17,7 @@
    <feature url="features/org.eclipse.linuxtools.ctf_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
+   -->
    <feature url="features/org.eclipse.linuxtools.changelog_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
@@ -55,6 +57,7 @@
    <feature url="features/org.eclipse.linuxtools.gcov_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gcov" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
+   <!--
    <feature url="features/org.eclipse.linuxtools.lttng2.control_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.control" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
@@ -67,6 +70,7 @@
    <feature url="features/org.eclipse.linuxtools.tmf.pcap_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tmf.pcap" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
+   -->
    <feature url="features/org.eclipse.linuxtools.perf_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.feature" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
@@ -82,9 +86,11 @@
    <feature url="features/org.eclipse.linuxtools.perf.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.remote.feature" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
+   <!--
    <feature url="features/org.eclipse.linuxtools.gdbtrace_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gdbtrace" version="0.0.0">
       <category name="Linux Tools"/>
    </feature>
+   -->
    <!-- Orbit Dependencies -->
    <iu id="org.swtchart" version="0.0.0">
       <category name="Linux Tools"/>
@@ -95,6 +101,7 @@
    <iu id="org.apache.xerces" version="0.0.0">
       <category name="Linux Tools"/>
    </iu>
+   <!--
    <feature url="features/org.eclipse.linuxtools.tracing.rcp_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp" version="0.0.0">
       <category name="Linux Tools LTTng RCP"/>
    </feature>
@@ -110,6 +117,7 @@
    <feature url="features/org.eclipse.linuxtools.cdt.libhover.devhelp.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   -->
    <feature url="features/org.eclipse.linuxtools.changelog.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
@@ -119,9 +127,11 @@
    <feature url="features/org.eclipse.linuxtools.changelog.java.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.java.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   <!--
    <feature url="features/org.eclipse.linuxtools.ctf.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   -->
    <feature url="features/org.eclipse.linuxtools.dataviewers.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.dataviewers.feature.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
@@ -149,6 +159,7 @@
    <feature url="features/org.eclipse.linuxtools.valgrind.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   <!--
    <feature url="features/org.eclipse.linuxtools.lttng2.control.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.control.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
@@ -161,6 +172,7 @@
    <feature url="features/org.eclipse.linuxtools.tmf.pcap.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tmf.pcap.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   -->
    <feature url="features/org.eclipse.linuxtools.gcov.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gcov.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
@@ -179,30 +191,36 @@
    <feature url="features/org.eclipse.linuxtools.perf.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.remote.feature.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   <!--
    <feature url="features/org.eclipse.linuxtools.gdbtrace.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gdbtrace.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
    <feature url="features/org.eclipse.linuxtools.tracing.rcp.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   -->
    <category-def name="Linux Tools" label="Linux Tools">
       <description>
          Eclipse Linux Tools
       </description>
    </category-def>
+   <!--
    <category-def name="Linux Tools Additional Library API Hoverhelp" label="Linux Tools Additional Library API Hoverhelp">
       <description>
          Optional library API documentation for use with C/C++ hover help and completion
       </description>
    </category-def>
+   -->
    <category-def name="Linux Tools Sources" label="Linux Tools Sources">
       <description>
          Eclipse Linux Tools source features and bundles
       </description>
    </category-def>
+   <!--
    <category-def name="Linux Tools LTTng RCP" label="Linux Tools LTTng RCP">
       <description>
          Optional LTTng features
       </description>
    </category-def>
+   -->
 </site>