diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 1d06133199a..760626dc91a 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -43,6 +43,7 @@ fi
 TPVERSION="Target Management"
 VERSION=3.2
 DO_STATS=0
+DO_CATEGORIES=0
 TYPE=none
 SITEDIR=`basename ${SITE}`
 case ${SITEDIR} in
@@ -53,7 +54,7 @@ case ${SITEDIR} in
   *)              TYPE=unknown ;;
 esac
 case ${SITEDIR} in
-  3.2*)  VERSION=3.2 ;;
+  3.2*)  VERSION=3.2 ; DO_CATEGORIES=1 ;;
 esac
 case ${SITEDIR} in
   3.2) DO_STATS=1 ;;
@@ -499,8 +500,6 @@ if [ x${DO_STATS} = x1 ]; then
   $CMD
   result=$?
   echo "result: ${result}"
-    #-reusePack200Files \
-    #-noDefaultIUs \
 fi
 echo "Creating P2 metadata (no download stats)..."
 java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
@@ -516,6 +515,19 @@ java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
     -noDefaultIUs \
     -vmargs -Xmx256M
 
+if [ x${DO_CATEGORIES} = x1 ]; then
+  echo "Adding Categories..."
+  CMD="java -jar ${tgtlauncher} \
+    -application -application org.eclipse.equinox.p2.publisher.CategoryPublisher \
+    -metadataRepository file:${SITE} \
+    -categoryDefinition file:/${SITE}/category.xml \
+    -compress"
+  echo $CMD
+  $CMD
+  result=$?
+  echo "result: ${result}"
+fi
+
 cd $SITE
 chgrp -R dsdp-tmadmin .
 chmod -R g+w .
diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
new file mode 100644
index 00000000000..2016b3635fa
--- /dev/null
+++ b/releng/org.eclipse.rse.updatesite/category.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.rse.sdk_3.2.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.2.0.qualifier">
+      <category name="RSE"/>
+   </feature>
+   <feature url="features/org.eclipse.rse_3.2.0.qualifier.jar" id="org.eclipse.rse" version="3.2.0.qualifier">
+      <category name="RSE"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.useractions_1.1.200.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.200.qualifier">
+      <category name="RSE"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.terminal.sdk_3.1.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.0.qualifier">
+      <category name="Terminal"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.1.0.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.1.0.qualifier">
+      <category name="Terminal"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
+      <category name="Incubation and Test"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier">
+      <category name="Incubation and Test"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.tests_3.2.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.2.0.qualifier">
+      <category name="Incubation and Test"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.examples_3.1.100.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.100.qualifier">
+      <category name="Examples"/>
+   </feature>
+   <category-def name="RSE" label="RSE">
+      <description>
+         Remote System Explorer (RSE)
+      </description>
+   </category-def>
+   <category-def name="Terminal" label="Terminal"/>
+   <category-def name="Incubation and Test" label="Incubation and Test"/>
+   <category-def name="Examples" label="Examples"/>
+</site>