diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
index e8d6ca7da..6e59c8541 100644
--- a/releng/org.eclipse.ecf.releng.repository/category.xml
+++ b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -159,9 +159,13 @@
    <feature id="org.eclipse.ecf.xmpp.feature.source" version="0.0.0">
       <category name="other"/>
    </feature>
+   <feature id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature">
+      <category name="bndtools"/>
+   </feature>
    <category-def name="sdk" label="ECF SDK for Eclipse"/>
    <category-def name="core" label="ECF Core Features"/>
    <category-def name="core sources" label="ECF Core Source Features"/>
    <category-def name="remoteservices" label="ECF Remote Services SDK"/>
    <category-def name="other" label="Other ECF Features"/>
+   <category-def name="bndtools" label="ECF Bndtools Core Support"/>
 </site>
diff --git a/releng/org.eclipse.ecf.releng/projectSet-git.psf b/releng/org.eclipse.ecf.releng/projectSet-git.psf
index 357b66bac..68f896885 100644
--- a/releng/org.eclipse.ecf.releng/projectSet-git.psf
+++ b/releng/org.eclipse.ecf.releng/projectSet-git.psf
@@ -120,6 +120,8 @@
 <project reference="1.0,https://github.com/eclipse/ecf.git,master,framework/bundles/org.eclipse.ecf.remoteservice.ui"/>
 <project reference="1.0,https://github.com/eclipse/ecf.git,master,framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi"/>
 <project reference="1.0,https://github.com/eclipse/ecf.git,master,tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde"/>
+<project reference="1.0,https://github.com/eclipse/ecf.git,master,tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools"/>
+<project reference="1.0,https://github.com/eclipse/ecf.git,master,tooling/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature"/>
 <project reference="1.0,https://github.com/eclipse/ecf.git,master,releng/features/org.eclipse.ecf.sdk"/>
 <project reference="1.0,https://github.com/eclipse/ecf.git,master,server-side/bundles/org.eclipse.ecf.server"/>
 <project reference="1.0,https://github.com/eclipse/ecf.git,master,server-side/features/org.eclipse.ecf.server.feature"/>
@@ -366,6 +368,7 @@
 <item elementID="=org.eclipse.ecf.remoteservice.ui/src" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.ecf.remoteservice.ui.dosgi/src" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.ecf.remoteservices.tooling.pde/src" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
+<item elementID="=org.eclipse.ecf.remoteservices.tooling.bndtools/src" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.ecf.server/src" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.ecf.server.generic/src" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.ecf.sharedobject/src" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
@@ -438,6 +441,7 @@
 <item elementID="=org.eclipse.ecf.remoteservice.servlet" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 </workingSets>
 <workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1552872660789_68" label="Tooling" name="Tooling">
+<item elementID="=org.eclipse.ecf.remoteservices.tooling.bndtools" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 <item elementID="=org.eclipse.ecf.remoteservices.tooling.pde" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
 </workingSets>
 <workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1552873248719_73" label="UI" name="UI">