diff --git a/.hgignore b/.hgignore
index a5668b81f8..02375c14b9 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,6 +3,7 @@ build
External Plug-in Libraries
org.eclipse.jetty.http/bin
+alpn-boot.jar
syntax: regexp
^adempiere$
^org\.adempiere\.install/lib$
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 9375c4361f..5612b1d021 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -162,7 +162,6 @@
-
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 185b99c3e4..2cc27b38d4 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -31,6 +31,8 @@ url.modify.bundle=http://downloads.sourceforge.net/project/idempiere/binary.file
url.file.jp.lib=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-6.3.0
+url.alpn.boot=http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar
+
extend.bundle.folder.1
extend.bundle.folder.2
extend.bundle.folder.3
diff --git a/org.adempiere.server-feature/build.properties b/org.adempiere.server-feature/build.properties
index 6d90205e42..19b15a49f4 100644
--- a/org.adempiere.server-feature/build.properties
+++ b/org.adempiere.server-feature/build.properties
@@ -1,5 +1,5 @@
bin.includes = feature.xml
-root=file:build.xml,file:setup.ini,file:extensions-priorty.properties,file:hazelcast-template.xml
+root=file:build.xml,file:setup.ini,file:extensions-priorty.properties,file:hazelcast-template.xml,file:../alpn-boot.jar
root.folder.data=data
root.folder.setup=setup
root.folder.jettyhome=jettyhome
diff --git a/org.adempiere.server-feature/copyjars.xml b/org.adempiere.server-feature/copyjars.xml
index 53bc2275d3..83478a900f 100644
--- a/org.adempiere.server-feature/copyjars.xml
+++ b/org.adempiere.server-feature/copyjars.xml
@@ -36,5 +36,8 @@
+
+
+
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index a3a16c4277..6074387de0 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -467,13 +467,6 @@
version="0.0.0"
unpack="false"/>
-
-
-console 12612 --launcher.XXMaxPermSize 192m
- -Xbootclasspath/p:plugins/org.mortbay.jetty.alpn.boot_8.1.7.v20160121.jar -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dosgi.console=localhost:12612 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true
+ -Xbootclasspath/p:alpn-boot.jar -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dosgi.console=localhost:12612 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true
-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -Djetty.home=${workspace_loc}/jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-selector.xml,etc/jetty-ssl.xml,etc/jetty-https.xml,etc/jetty-deployer.xml
-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 916dafc3e5..b470e8ade3 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -19,12 +19,12 @@
-
+
-
+