diff --git a/org.adempiere.server-feature/buckminster.properties b/org.adempiere.server-feature/buckminster.properties
index e369e06b2b..0c131db9fa 100644
--- a/org.adempiere.server-feature/buckminster.properties
+++ b/org.adempiere.server-feature/buckminster.properties
@@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
 target.os=*
 target.ws=*
 target.arch=*
+
+product.features=org.idempiere.eclipse.platform.feature.group  
+product.profile=DefaultProfile
+product.id=org.adempiere.server.product
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
index 113544ffb5..8127877a58 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
@@ -11,5 +11,5 @@ target.ws=gtk
 target.arch=x86_64
 
 product.features=org.idempiere.eclipse.platform.feature.group  
-product.profile=ServerProfile
+product.profile=DefaultProfile
 product.id=org.adempiere.server.product
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
index 113544ffb5..8127877a58 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
@@ -11,5 +11,5 @@ target.ws=gtk
 target.arch=x86_64
 
 product.features=org.idempiere.eclipse.platform.feature.group  
-product.profile=ServerProfile
+product.profile=DefaultProfile
 product.id=org.adempiere.server.product
diff --git a/org.adempiere.server-feature/buckminster_macosx_x86.properties b/org.adempiere.server-feature/buckminster_macosx_x86.properties
index dc676ea47e..1e303d33d8 100644
--- a/org.adempiere.server-feature/buckminster_macosx_x86.properties
+++ b/org.adempiere.server-feature/buckminster_macosx_x86.properties
@@ -11,5 +11,5 @@ target.ws=cocoa
 target.arch=x86
 
 product.features=org.idempiere.eclipse.platform.feature.group  
-product.profile=ServerProfile
+product.profile=DefaultProfile
 product.id=org.adempiere.server.product
diff --git a/org.adempiere.server-feature/buckminster_win32_x86.properties b/org.adempiere.server-feature/buckminster_win32_x86.properties
index 6aeaeac1fd..81f260903e 100644
--- a/org.adempiere.server-feature/buckminster_win32_x86.properties
+++ b/org.adempiere.server-feature/buckminster_win32_x86.properties
@@ -11,5 +11,5 @@ target.ws=win32
 target.arch=x86
 
 product.features=org.idempiere.eclipse.platform.feature.group  
-product.profile=ServerProfile
+product.profile=DefaultProfile
 product.id=org.adempiere.server.product
diff --git a/org.adempiere.ui.swing-feature/buckminster.cspex b/org.adempiere.ui.swing-feature/buckminster.cspex
index 083978f328..6e2126821d 100644
--- a/org.adempiere.ui.swing-feature/buckminster.cspex
+++ b/org.adempiere.ui.swing-feature/buckminster.cspex
@@ -5,6 +5,7 @@
 	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
 	<dependencies>
 		<!-- Place your Dependencies here -->
+		<dependency name="org.idempiere.eclipse.platform" componentType="eclipse.feature"/>
 	</dependencies>
 	<generators>
 		<!-- Place your Generators here -->
@@ -18,9 +19,10 @@
                 <property key="buildFile" value="product.ant" />
                 <property key="targets" value="create.product" />
             </actorProperties>
-            <properties>
-                <property key="profile" value="ClientProfile" />
-                <property key="iu" value="org.adempiere.ui.swing.product" />
+            <properties>  
+                <property key="profile" value="${product.profile}" />  
+                <property key="iu" value="${product.id}" />  
+                <property key="features" value="${product.features}" />  
             </properties>
             <prerequisites alias="repository">
                 <attribute name="site.p2" />
@@ -55,6 +57,11 @@
 		<!-- Place your Action alterations here -->
 	</alterActions>
 	<alterGroups>
-		<!-- Place your Group alterations here -->
+		<public name="bundle.jars">
+			<attribute name="bundle.jars" component="org.idempiere.eclipse.platform"/>
+		</public>
+		<public name="feature.references">
+			<attribute name="feature.jars" component="org.idempiere.eclipse.platform"/>
+        </public>
 	</alterGroups>
 </cspecExtension>
diff --git a/org.adempiere.ui.swing-feature/buckminster.properties b/org.adempiere.ui.swing-feature/buckminster.properties
index e369e06b2b..3df88687cd 100644
--- a/org.adempiere.ui.swing-feature/buckminster.properties
+++ b/org.adempiere.ui.swing-feature/buckminster.properties
@@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
 target.os=*
 target.ws=*
 target.arch=*
+
+product.features=org.idempiere.eclipse.platform.feature.group  
+product.profile=DefaultProfile
+product.id=org.adempiere.ui.swing.product
\ No newline at end of file
diff --git a/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
index 03a1c116ea..0bc5e722af 100644
--- a/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
@@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
 target.os=linux
 target.ws=gtk
 target.arch=x86
+
+product.features=org.idempiere.eclipse.platform.feature.group  
+product.profile=DefaultProfile
+product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties b/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
index 90133a4539..c473099a1a 100644
--- a/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
@@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
 target.os=macosx
 target.ws=cocoa
 target.arch=x86
+
+product.features=org.idempiere.eclipse.platform.feature.group  
+product.profile=DefaultProfile
+product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties b/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
index 0442e2144a..fcd68b1bb3 100644
--- a/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
@@ -9,3 +9,7 @@ generator.buildTimestamp.format='v'yyyyMMdd-HHmm
 target.os=win32
 target.ws=win32
 target.arch=x86
+
+product.features=org.idempiere.eclipse.platform.feature.group  
+product.profile=DefaultProfile
+product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/product.ant b/org.adempiere.ui.swing-feature/product.ant
index 7e3d3045ae..ac554c3bbb 100644
--- a/org.adempiere.ui.swing-feature/product.ant
+++ b/org.adempiere.ui.swing-feature/product.ant
@@ -11,6 +11,7 @@
 	 </pathconvert>
 
 	<target name="create.product">
+		<property name="installableIUs" value="${iu},${features}" />
 		<property name="destination" location="${sp:destination}"/>
 		<delete dir="${destination}"/>
 		<makeurl property="repository" file="${sp:repository}"/>
@@ -31,7 +32,7 @@
 			<arg value="-profileProperties" />
 			<arg value="org.eclipse.update.install.features=true" />
 			<arg value="-installIU"/>
-			<arg value="${iu}"/>
+			<arg value="${installableIUs}"/>
 			<arg value="-p2.os" />
 			<arg value="${target.os}" />
 			<arg value="-p2.ws" />
diff --git a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
index 19ab1347bc..3aa0bd19be 100644
--- a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
+++ b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
@@ -3,5 +3,5 @@ equinox.use.ds=true
 osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.hamcrest.core,org.junit,org.apache.commons.collections,org.apache.ant,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,org.eclipse.osgi.services,org.sat4j.core,org.sat4j.pb,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.httpclient.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.ssl,org.eclipse.equinox.ds@start,org.eclipse.equinox.event,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.http.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.transport.ecf,org.eclipse.equinox.security,org.eclipse.equinox.util,org.apache.commons.httpclient,org.eclipse.equinox.simpleconfigurator.manipulator,org.apache.commons.codec,org.eclipse.equinox.simpleconfigurator
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4
-eclipse.p2.profile=ServerProfile
+eclipse.p2.profile=DefaultProfile
 eclipse.p2.data.area=@config.dir/../../p2/
\ No newline at end of file