diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
index b421bad3f54..a94cbc85d0b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.eclipse.sdk.tests" version="0.0.0"/>
+   <feature id="org.eclipse.sdk.tests">
+      <category name="org.eclipse.releng.testsIU"/>
+   </feature>
    <feature id="org.eclipse.equinox.p2.sdk" version="0.0.0"/>
    <feature id="org.eclipse.equinox.p2.discovery.feature" version="0.0.0"/>
    <feature id="org.eclipse.core.runtime.feature" version="0.0.0"/>
-   <feature id="org.eclipse.equinox.sdk" version="0.0.0"/>
-   <feature id="org.eclipse.sdk.examples" version="0.0.0"/>
-   <feature id="org.eclipse.swt.tools.feature" version="0.0.0"/>
+   <feature id="org.eclipse.equinox.sdk">
+      <category name="org.eclipse.equinox.target.categoryIU"/>
+   </feature>
+   <feature id="org.eclipse.sdk.examples">
+      <category name="org.eclipse.releng.testsIU"/>
+   </feature>
+   <feature id="org.eclipse.swt.tools.feature">
+      <category name="org.eclipse.releng.testsIU"/>
+   </feature>
    <feature id="org.eclipse.equinox.executable" version="0.0.0"/>
    <feature id="org.eclipse.sdk" version="0.0.0"/>
    <feature id="org.eclipse.e4.core.tools.feature" version="0.0.0"/>
@@ -15,13 +23,66 @@
    <feature id="org.eclipse.tips.feature" version="0.0.0"/>
    <feature id="org.eclipse.jdt.ui.unittest.junit.feature" version="0.0.0"/>
    <feature id="org.eclipse.terminal.feature"/>
+   <feature id="org.eclipse.rcp">
+      <category name="org.eclipse.rcp.categoryIU"/>
+   </feature>
+   <feature id="org.eclipse.test">
+      <category name="org.eclipse.releng.testsIU"/>
+   </feature>
+   <feature id="org.eclipse.jdt">
+      <category name="org.eclipse.releng.java.languages.categoryIU"/>
+   </feature>
+   <feature id="org.eclipse.pde">
+      <category name="org.eclipse.releng.pde.categoryIU"/>
+   </feature>
    <bundle id="jakarta.annotation-api" version="1.3.5"/>
    <bundle id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
    <bundle id="org.eclipse.equinox.slf4j"/>
    <bundle id="org.eclipse.debug.terminal"/>
+   <iu id = "org.eclipse.sdk.ide">
+     <category name="org.eclipse.sdk.ide.categoryIU"/>
+   </iu>
+   <iu id = "org.eclipse.platform.ide">
+     <category name="org.eclipse.platform.ide.categoryIU"/>
+   </iu>
    <iu>
      <query> 
        <expression type="match">id == 'org.eclipse.equinox.executable'</expression>
      </query>
    </iu>
+   <category-def name="org.eclipse.equinox.target.categoryIU" label="Equinox Target Components">
+      <description>
+         Features especially useful to install as PDE runtime targets.
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.sdk.ide.categoryIU" label="Eclipse SDK">
+      <description>
+         The full version of Eclipse, with source and documentation: Platform, JDT and PDE.
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.platform.ide.categoryIU" label="Eclipse Platform">
+      <description>
+         Minimum version of Eclipse: no source or API documentation, no PDE or JDT.
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.rcp.categoryIU" label="Eclipse RCP Target Components">
+      <description>
+         Features to use as PDE runtime target, while developing RCP applications.
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.releng.testsIU" label="Eclipse Tests, Tools, Examples, and Extras">
+      <description>
+         Collection of Misc. Features, such as unit tests, SWT and e4 tools, examples, and compatibility features not shipped as part of main SDK, but which some people may desire in creating products based on previous versions of Eclipse.
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.releng.java.languages.categoryIU" label="Eclipse Java Development Tools">
+      <description>
+         Tools to allow development with Java.
+      </description>
+   </category-def>
+   <category-def name="org.eclipse.releng.pde.categoryIU" label="Eclipse Plugin Development Tools">
+      <description>
+         Tools to develop bundles, plugins and features.
+      </description>
+   </category-def>
 </site>