diff --git a/io.sloeber.autoBuild.product/.gitignore b/io.sloeber.autoBuild.product/.gitignore
new file mode 100644
index 00000000..09e3bc9b
--- /dev/null
+++ b/io.sloeber.autoBuild.product/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/io.sloeber.autoBuild.product/.project b/io.sloeber.autoBuild.product/.project
new file mode 100644
index 00000000..29385a17
--- /dev/null
+++ b/io.sloeber.autoBuild.product/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>io.sloeber.autoBuild.product</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/io.sloeber.autoBuild.product/META-INF/MANIFEST.MF b/io.sloeber.autoBuild.product/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..42c32bc3
--- /dev/null
+++ b/io.sloeber.autoBuild.product/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: AutoBuildProduct
+Bundle-SymbolicName: io.sloeber.autoBuild.product;singleton:=true
+Bundle-Vendor: baeyens.it
+Bundle-Version: 5.0.0.qualifier
+Import-Package: org.eclipse.cdt.build.core.scannerconfig,
+ org.eclipse.cdt.newmake.core,
+ org.eclipse.cdt.build.internal.core.scannerconfig2
+Require-Bundle: org.eclipse.swt,
+ org.eclipse.jface,
+ org.eclipse.pde;resolution:=optional,
+ org.eclipse.pde.ui;resolution:=optional
+Automatic-Module-Name: io.sloeber.autoBuild.product
+Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/io.sloeber.autoBuild.product/autoBuild.product b/io.sloeber.autoBuild.product/autoBuild.product
new file mode 100644
index 00000000..480811ed
--- /dev/null
+++ b/io.sloeber.autoBuild.product/autoBuild.product
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="AutoBuild" uid="io.sloeber.autoBuild.product" id="io.sloeber.autoBuild.product" application="org.eclipse.ui.ide.workbench" version="5.0.0.qualifier" type="bundles" includeLaunchers="true" autoIncludeRequirements="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <launcher>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+      <plugin id="io.sloeber.autoBuild.ui"/>
+      <plugin id="org.eclipse.cdt.make.core"/>
+      <plugin id="org.eclipse.cdt.make.ui"/>
+   </plugins>
+
+
+</product>
diff --git a/io.sloeber.autoBuild.product/build.properties b/io.sloeber.autoBuild.product/build.properties
new file mode 100644
index 00000000..34d2e4d2
--- /dev/null
+++ b/io.sloeber.autoBuild.product/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/io.sloeber.autoBuild.product/plugin.xml b/io.sloeber.autoBuild.product/plugin.xml
new file mode 100644
index 00000000..0b2589c6
--- /dev/null
+++ b/io.sloeber.autoBuild.product/plugin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         id="io.sloeber.autoBuild.product"
+         point="org.eclipse.core.runtime.products">
+      <product
+            name="AutoBuild"
+            application="org.eclipse.ui.ide.workbench">
+      </product>
+   </extension>
+
+</plugin>
diff --git a/io.sloeber.autoBuild.product/pom.xml b/io.sloeber.autoBuild.product/pom.xml
new file mode 100644
index 00000000..9d7d1fbc
--- /dev/null
+++ b/io.sloeber.autoBuild.product/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+        <groupId>io.sloeber.arduino-eclipse-plugin</groupId>
+		<artifactId>io.sloeber.parent</artifactId>
+		<version>5.0.0-SNAPSHOT</version>
+    <relativePath>../io.sloeber.parent</relativePath>
+	</parent>
+
+	<artifactId>io.sloeber.autoBuild.product</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<!-- http://eclipse.org/tycho/sitedocs/tycho-p2/tycho-p2-director-plugin/plugin-info.html -->
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<id>materialize-products</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>archive-products</id>
+						<goals>
+							<goal>archive-products</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<formats>
+						<win32>zip</win32>
+						<linux>tar.gz</linux>
+						<macosx>zip</macosx>
+					</formats>
+					<products>
+						<product>
+							<!-- id is verbatim to todo.product "uid" -->
+							<id>io.sloeber.autoBuild.product</id>
+							<!-- Customise the packaged product's archive name (Instead of "io.sloeber.autoBuild.product")
+							    Suffix is still <os>.<ws>.<arch>.<archiveExtension> (e.g. linux.gtk.x86_64.tar.gz)
+							 -->
+                            <archiveFileName>sloeber-autobuild-ide-${platform-version-name}</archiveFileName>
+							<!-- Causes the archives to contain a folder todo/ that contains the
+								application -->
+							<!-- Without it, the application is at the archive root -->
+							<rootFolder>Sloeber</rootFolder>
+							<!-- On Linux self contained installations are commonly extract to
+								/opt folder -->
+							<!-- LSB: "binary-only packages of nonessential applications and add-on
+								software products" -->
+						</product>
+					</products>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/io.sloeber.autoBuild.ui/META-INF/MANIFEST.MF b/io.sloeber.autoBuild.ui/META-INF/MANIFEST.MF
index 3ed31b79..827c2eb9 100644
--- a/io.sloeber.autoBuild.ui/META-INF/MANIFEST.MF
+++ b/io.sloeber.autoBuild.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.tools.templates.ui,
  org.eclipse.cdt.ui,
  org.eclipse.core.filesystem,
  io.sloeber.autoBuild;bundle-version="4.4.1",
- org.eclipse.tools.templates.core;bundle-version="2.0.0"
+ org.eclipse.tools.templates.core;bundle-version="2.0.0",
+ org.eclipse.pde,
+ org.eclipse.pde.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: Sloeber.io
 Bundle-ActivationPolicy: lazy
diff --git a/io.sloeber.parent/pom.xml b/io.sloeber.parent/pom.xml
index c2d2c441..638baaa7 100644
--- a/io.sloeber.parent/pom.xml
+++ b/io.sloeber.parent/pom.xml
@@ -136,6 +136,7 @@
 				<module>../io.sloeber.autoBuild</module>
 				<module>../io.sloeber.autoBuild.ui</module>
 				<module>../io.sloeber.autoBuild.test</module>
+				<module>../io.sloeber.autoBuild.product</module>
 				<module>../io.sloeber.feature</module>
 				<module>../io.sloeber.core</module>
 				<module>../io.sloeber.core.nl1</module>
diff --git a/io.sloeber.product/META-INF/MANIFEST.MF b/io.sloeber.product/META-INF/MANIFEST.MF
index 94624001..7b1e34eb 100644
--- a/io.sloeber.product/META-INF/MANIFEST.MF
+++ b/io.sloeber.product/META-INF/MANIFEST.MF
@@ -3,7 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Sloeber product
 Bundle-SymbolicName: io.sloeber.product;singleton:=true
 Bundle-Version: 5.0.0.qualifier
-Require-Bundle: io.sloeber.ui;bundle-version="5.0.0"
+Require-Bundle: io.sloeber.ui;bundle-version="5.0.0",
+ org.eclipse.pde;resolution:=optional,
+ org.eclipse.pde.ui;resolution:=optional,
+ org.eclipse.ui.intro
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: baeyens.it
 Automatic-Module-Name: io.sloeber.product