diff --git a/org.idempiere.p2/.project b/org.idempiere.p2/.project
new file mode 100644
index 0000000000..1970806a40
--- /dev/null
+++ b/org.idempiere.p2/.project
@@ -0,0 +1,23 @@
+
+
+ org.idempiere.p2
+
+
+
+
+
+ org.eclipse.pde.UpdateSiteBuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+ org.eclipse.pde.UpdateSiteNature
+
+
diff --git a/org.idempiere.p2/.settings/org.eclipse.core.resources.prefs b/org.idempiere.p2/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/org.idempiere.p2/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/=UTF-8
diff --git a/org.idempiere.p2/.settings/org.eclipse.m2e.core.prefs b/org.idempiere.p2/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/org.idempiere.p2/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml
new file mode 100644
index 0000000000..d6e2d8347c
--- /dev/null
+++ b/org.idempiere.p2/category.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.p2/pom.xml b/org.idempiere.p2/pom.xml
new file mode 100644
index 0000000000..f3c8ef93ea
--- /dev/null
+++ b/org.idempiere.p2/pom.xml
@@ -0,0 +1,46 @@
+
+ 4.0.0
+
+ org.idempiere
+ org.idempiere.parent
+ 5.1.0-SNAPSHOT
+ ../org.idempiere.parent/pom.xml
+
+ org.idempiere.p2
+ eclipse-repository
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+
+
+
+ materialize-products
+
+ materialize-products
+
+
+
+
+ archive-products
+
+ archive-products
+
+
+
+
+
+
+
+ org.adempiere.server.product
+ idempiere-server-${unqualifiedVersion}-${buildQualifier}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
new file mode 100644
index 0000000000..63901f2f69
--- /dev/null
+++ b/org.idempiere.p2/server.product
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+ -console
+
+ -Xbootclasspath/p:alpn-boot.jar -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -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 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
+
+ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 1255828301..2f9b482549 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -492,6 +492,11 @@
download-maven-plugin
${download-maven-version}
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.extras.version}
+
diff --git a/pom.xml b/pom.xml
index cfefa052ff..c7281d5e29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
org.idempiere.hazelcast.service-feature
org.adempiere.payment.processor-feature
org.idempiere.zk-feature
+ org.idempiere.p2
\ No newline at end of file