diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index 7f8ea6e4a..55a168fbe 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -78,10 +78,10 @@ openFile</programArgs>
       <feature id="net.mihai-nita.ansicon" installMode="root"/>
 
       <feature id="org.springsource.ide.eclipse.commons.quicksearch.feature" installMode="root"/>
-      <feature id="org.springframework.ide.eclipse.boot.feature" installMode="root"/>
       <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
 
       <feature id="org.springframework.boot.ide.branding.feature" installMode="root"/>
+      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
       <feature id="org.springframework.boot.ide.properties.servers.feature" installMode="root"/>
       <feature id="org.springframework.boot.ide.cloudfoundry.server.feature" installMode="root"/>
 
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index da15b2798..e34c3a8cb 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -27,6 +27,8 @@
 	</licenses>
 
 	<modules>
+		<module>../eclipse-extensions/org.springframework.boot.ide.main.feature</module>
+		
 		<module>org.springframework.boot.ide.branding</module>
 		<module>org.springframework.boot.ide.branding.feature</module>
 	</modules>
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/build.properties b/eclipse-extensions/org.springframework.boot.ide.main.feature/build.properties
new file mode 100644
index 000000000..64f93a9f0
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
new file mode 100644
index 000000000..eae1d07b9
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+	id="org.springframework.boot.ide.main.feature"
+	label="Spring Boot IDE Main Feature"
+	version="4.0.0.qualifier"
+	provider-name="Pivotal, Inc.">
+
+	<plugin
+		id="org.springframework.ide.eclipse.boot"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
+
+	<plugin
+		id="org.springframework.ide.eclipse.boot.templates"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
+
+	<plugin
+		id="org.springframework.ide.eclipse.boot.launch"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
+
+	<plugin
+		id="org.springframework.ide.eclipse.boot.wizard"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
+
+	<plugin
+		id="org.springframework.ide.eclipse.boot.restart"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
+
+	<plugin
+		id="org.springframework.ide.eclipse.imports"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
+
+</feature>
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml
new file mode 100644
index 000000000..427874f94
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml
@@ -0,0 +1,15 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../../eclipse-distribution/pom.xml</relativePath>
+	</parent>
+	
+	<artifactId>org.springframework.boot.ide.main.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	  
+</project>