diff --git a/org.adempiere.ui.swing-feature/adempiere-client.bat b/org.adempiere.ui.swing-feature/adempiere-client.bat
new file mode 100644
index 0000000000..2c866c60a9
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/adempiere-client.bat
@@ -0,0 +1,20 @@
+@Echo off
+
+
+@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK
+@Set JAVA=java
+@Echo JAVA_HOME is not set.
+@Echo You may not be able to start the server
+@Echo Set JAVA_HOME to the directory of your local 1.6 JDK.
+goto START
+
+:JAVA_HOME_OK
+@Set JAVA=%JAVA_HOME%\bin\java
+
+
+:START
+@Echo =======================================
+@Echo Starting Adempiere Client ...
+@Echo =======================================
+
+@"%JAVA%" -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -application org.adempiere.ui.swing.client
diff --git a/org.adempiere.ui.swing-feature/adempiere-client.sh b/org.adempiere.ui.swing-feature/adempiere-client.sh
new file mode 100644
index 0000000000..f43afa5d5b
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/adempiere-client.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+if [ $JAVA_HOME ]; then
+  JAVA=$JAVA_HOME/bin/java
+else
+  JAVA=java
+  echo JAVA_HOME is not set.
+  echo You may not be able to start the server
+  echo Set JAVA_HOME to the directory of your local JDK.
+fi
+
+echo ===================================
+echo Starting Adempiere Client
+echo ===================================
+
+$JAVA -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -application org.adempiere.ui.swing.client
diff --git a/org.adempiere.ui.swing-feature/buckminster.cspex b/org.adempiere.ui.swing-feature/buckminster.cspex
new file mode 100644
index 0000000000..db20cd6409
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/buckminster.cspex
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cspecExtension
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
+	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
+	<dependencies>
+		<!-- Place your Dependencies here -->
+	</dependencies>
+	<generators>
+		<!-- Place your Generators here -->
+	</generators>
+	<artifacts>
+		<!-- Place your Artifacts here -->
+	</artifacts>
+	<actions>
+        <public name="create.product" actor="ant">
+            <actorProperties>
+                <property key="buildFile" value="product.ant" />
+                <property key="targets" value="create.product" />
+            </actorProperties>
+            <properties>
+                <property key="profile" value="ServerProfile" />
+                <property key="iu" value="org.adempiere.server.product" />
+            </properties>
+            <prerequisites alias="repository">
+                <attribute name="site.p2" />
+            </prerequisites>
+            <products alias="destination" base="${buckminster.output}">
+                <path path="adempiere.${target.ws}.${target.os}.${target.arch}/" />
+            </products>
+        </public>
+        <public name="create.product.zip" actor="ant">
+            <actorProperties>
+                <property key="buildFileId" value="buckminster.pdetasks" />
+                <property key="targets" value="create.zip" />
+            </actorProperties>
+            <prerequisites alias="action.requirements">
+                <attribute name="create.product" />
+            </prerequisites>
+            <products alias="action.output" base="${buckminster.output}">
+                <path path="adempiere.${target.ws}.${target.os}.${target.arch}.zip" />
+            </products>
+        </public>
+    </actions>
+	<groups>
+		<!-- Place your Groups here -->
+	</groups>
+	<alterDependencies>
+		<!-- Place your Dependency alterations here -->
+	</alterDependencies>
+	<alterArtifacts>
+		<!-- Place your Artifact alterations here -->
+	</alterArtifacts>
+	<alterActions>
+		<!-- Place your Action alterations here -->
+	</alterActions>
+	<alterGroups>
+		<!-- Place your Group alterations here -->
+	</alterGroups>
+</cspecExtension>
diff --git a/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
new file mode 100644
index 0000000000..03a1c116ea
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
@@ -0,0 +1,11 @@
+## buckminster.properties ##
+#Where all the output should go
+buckminster.output.root=${user.home}/buckminster.output
+# Where the temp files should go
+buckminster.temp.root=${user.home}/tmp
+# How .qualifier in versions should be replaced
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmm
+target.os=linux
+target.ws=gtk
+target.arch=x86
diff --git a/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties b/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
new file mode 100644
index 0000000000..90133a4539
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
@@ -0,0 +1,11 @@
+## buckminster.properties ##
+#Where all the output should go
+buckminster.output.root=${user.home}/buckminster.output
+# Where the temp files should go
+buckminster.temp.root=${user.home}/tmp
+# How .qualifier in versions should be replaced
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmm
+target.os=macosx
+target.ws=cocoa
+target.arch=x86
diff --git a/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties b/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
new file mode 100644
index 0000000000..0442e2144a
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
@@ -0,0 +1,11 @@
+## buckminster.properties ##
+#Where all the output should go
+buckminster.output.root=${user.home}/buckminster.output
+# Where the temp files should go
+buckminster.temp.root=${user.home}/tmp
+# How .qualifier in versions should be replaced
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmm
+target.os=win32
+target.ws=win32
+target.arch=x86
diff --git a/org.adempiere.ui.swing-feature/product.ant b/org.adempiere.ui.swing-feature/product.ant
new file mode 100644
index 0000000000..7e3d3045ae
--- /dev/null
+++ b/org.adempiere.ui.swing-feature/product.ant
@@ -0,0 +1,45 @@
+<project>
+	 <pathconvert property="equinox.launcher.jar">
+	   <first count="1">
+	     <sort>
+	       <fileset dir="${eclipse.home}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar"/>
+	       <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
+	         <date/>
+	       </reverse>
+	     </sort>
+	   </first>
+	 </pathconvert>
+
+	<target name="create.product">
+		<property name="destination" location="${sp:destination}"/>
+		<delete dir="${destination}"/>
+		<makeurl property="repository" file="${sp:repository}"/>
+		<mkdir dir="${destination}"/>
+		<echoproperties/>
+		<echo message="${equinox.launcher.jar}"/>
+		<echo message="${repository}"/>
+		<echo message="${destination}"/>
+		<java jar="${equinox.launcher.jar}" fork="true" failonerror="true" >
+			<arg value="-application"/>
+			<arg value="org.eclipse.equinox.p2.director"/>
+			<arg value="-repository"/>
+			<arg value="${repository}"/>
+			<arg value="-destination"/>
+			<arg value="${destination}/adempiere-client"/>
+			<arg value="-profile"/>
+			<arg value="${profile}"/>
+			<arg value="-profileProperties" />
+			<arg value="org.eclipse.update.install.features=true" />
+			<arg value="-installIU"/>
+			<arg value="${iu}"/>
+			<arg value="-p2.os" />
+			<arg value="${target.os}" />
+			<arg value="-p2.ws" />
+			<arg value="${target.ws}" />
+			<arg value="-p2.arch" />
+			<arg value="${target.arch}" />
+			<arg value="-consoleLog"/>
+			<!-- jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y"/ -->
+		</java>
+	</target>
+</project>
\ No newline at end of file
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
index ca60f97a18..e7e2485459 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -7,12 +7,12 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-console</programArgs>
-      <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal</vmArgs>
+      <programArgs>--launcher.XXMaxPermSize 192m</programArgs>
+      <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true</vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
-   <launcher name="adempiere">
+   <launcher name="adempiere-client">
       <solaris/>
       <win useIco="false">
          <bmp/>