diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 91ee48d13c..454ea33292 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -337,4 +337,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.http.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index 12bec589ee..843b7747b6 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -34,6 +34,9 @@
 
    <configurations>
       <plugin id="org.adempiere.base" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" />
+      <plugin id="org.adempiere.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="0" />
+      <plugin id="org.adempiere.eclipse.equinox.servletbridge" autoStart="true" startLevel="0" />
       <plugin id="org.adempiere.install" autoStart="true" startLevel="4" />
       <plugin id="org.adempiere.replication.server" autoStart="true" startLevel="4" />
       <plugin id="org.adempiere.report.jasper.webapp" autoStart="true" startLevel="4" />
@@ -44,6 +47,7 @@
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.gemini.web.core" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.gemini.web.extender" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" startLevel="4" />
diff --git a/org.adempiere.server-feature/setup-alt.bat b/org.adempiere.server-feature/setup-alt.bat
index 09d1b75fc5..671b3b6df5 100644
--- a/org.adempiere.server-feature/setup-alt.bat
+++ b/org.adempiere.server-feature/setup-alt.bat
@@ -1,4 +1,4 @@
-@Title Setup Adempiere Server
+@Title ... Setup Adempiere Server
 @Rem  $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $
 @Echo off
 
@@ -30,9 +30,10 @@ goto START
 
 :NEXT
 @REM setup tomcat
+@Echo ... Setup Tomcat
 @"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
-@Echo .
+@Echo ...
 @Echo For problems, check log file in base directory
 @Rem Wait 10 second
 @PING 1.1.1.1 -n 1 -w 10000 > NUL
diff --git a/org.adempiere.server-feature/setup-alt.sh b/org.adempiere.server-feature/setup-alt.sh
index 0598c40a4e..8dc778f1c9 100644
--- a/org.adempiere.server-feature/setup-alt.sh
+++ b/org.adempiere.server-feature/setup-alt.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-echo Setup Adempiere Server
+echo ... Setup Adempiere Server
 # $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $
 
 if [ $JAVA_HOME ]; then
@@ -17,14 +17,13 @@ fi
 #setup Adempiere.properties and AdempiereEnv.propertiess
 $JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -application org.adempiere.install.application -consoleLog
 
+echo ... Setup Tomcat
 #setup tomcat
 $JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
-echo ===================================
-echo Make .sh executable & set Env
-echo ===================================
+echo ... Make .sh executable
 chmod -R a+x *.sh
 find . -name '*.sh' -exec chmod a+x '{}' \;
 
-echo .
+echo ...
 echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/setup.bat b/org.adempiere.server-feature/setup.bat
index 1255ed074d..7e0f20369d 100644
--- a/org.adempiere.server-feature/setup.bat
+++ b/org.adempiere.server-feature/setup.bat
@@ -1,8 +1,8 @@
-@Title Install Adempiere Server
+@Title ... Setup Adempiere Server
 @Echo off
 
 @REM Setup Adempiere.properties and AdempiereEnv.properties
-adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog
+adempiere --launcher.ini setup.ini -application org.adempiere.install.application -consoleLog
 
 @Echo ErrorLevel = %ERRORLEVEL%
 @IF NOT ERRORLEVEL = 1 GOTO NEXT
@@ -14,9 +14,10 @@ adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.ap
 
 :NEXT
 @REM Setup Tomcat
+@Echo ... Setup Tomcat
 adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
-@Echo .
+@Echo ...
 @Echo For problems, check log file in base directory
 @Rem Wait 10 second
 @PING 1.1.1.1 -n 1 -w 10000 > NUL
diff --git a/org.adempiere.server-feature/setup.sh b/org.adempiere.server-feature/setup.sh
index fe7a1fb55d..55b9041247 100644
--- a/org.adempiere.server-feature/setup.sh
+++ b/org.adempiere.server-feature/setup.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
 #
-echo Setup Adempiere Server
+echo ... Setup Adempiere Server
 
 # Setup Adempiere.properties and AdempiereEnv.properties
-./adempiere -noExit --launcher.ini setup.ini -application org.adempiere.install.application
+./adempiere --launcher.ini setup.ini -application org.adempiere.install.application
 
+echo ... Setup Tomcat
 # Setup Tomcat
 ./adempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
-echo .
+echo ... Make .sh executable
+chmod -R a+x *.sh
+find . -name '*.sh' -exec chmod a+x '{}' \;
+
+echo ...
 echo For problems, check log file in base directory