diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 0d148c852..796a414b5 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -63,7 +63,6 @@
 		<module>../eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test</module>
 		<module>../eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test</module>
 		<module>../eclipse-extensions/org.springframework.ide.eclipse.docker.client</module>
-		<module>../eclipse-extensions/org.springframework.ide.eclipse.editor.support</module>
 		<module>../eclipse-extensions/org.springframework.ide.eclipse.maven.pom</module>
 		<module>../eclipse-extensions/org.springframework.ide.eclipse.maven.pom.tests</module>
 		<module>../eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces</module>
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
index b6ab409d6..6b534ae89 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
@@ -63,13 +63,6 @@
           version="0.0.0"
           unpack="false"/>
 
-    <plugin
-          id="org.springframework.ide.eclipse.editor.support"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-
     <plugin
           id="org.springframework.ide.eclipse.imports"
           download-size="0"
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
index bdea78660..e8066cbda 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
@@ -51,6 +51,10 @@
 	<bundle id="org.springframework.tooling.jdt.ls.commons.source"/>
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol"/>
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol.source"/>
+	
+    <bundle id="org.springframework.ide.eclipse.editor.support"/>
+    <bundle id="org.springframework.ide.eclipse.editor.support.source"/>
+	
 	<bundle id="org.springsource.ide.eclipse.commons.boot.ls"/>
 	<bundle id="org.springsource.ide.eclipse.commons.boot.ls.source"/>
 	<bundle id="org.springsource.ide.eclipse.commons.core"/>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index bb920478d..c39383940 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -38,14 +38,12 @@
 	</ciManagement>
 
 	<modules>
-        <module>../eclipse-extensions/org.springframework.ide.eclipse.boot</module>
-        <module>../eclipse-extensions/org.springframework.ide.eclipse.editor.support</module>
 		<module>../headless-services/jdt-ls-extension</module>
 		
 		<module>org.springframework.tooling.ls.eclipse.commons</module>
 		<module>org.springframework.tooling.ls.eclipse.commons.test</module>
-
         
+        <module>org.springframework.ide.eclipse.editor.support</module>
 		<module>org.springsource.ide.eclipse.commons.boot.ls</module>
 		<module>org.springsource.ide.eclipse.commons.core</module>
 		<module>org.springsource.ide.eclipse.commons.frameworks.core</module>