diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
index 203968c..67b009f 100644
--- a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
+++ b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml
@@ -4,8 +4,7 @@
       label="%featureName"
       version="0.9.0.qualifier"
       provider-name="%providerName"
-   	  plugin="org.eclipse.osbp.license.full">
-
+      plugin="org.eclipse.osbp.license.full">
 
    <description>
       %description
@@ -54,7 +53,7 @@
    <includes
          id="org.eclipse.osbp.dependencies.feature.e4tools.runtime"
          version="0.0.0"/>
-   
+
    <includes
          id="org.eclipse.osbp.dependencies.feature.eclipse.core"
          version="0.0.0"/>
@@ -140,6 +139,10 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.osbp.gitinfo.feature"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.osbp.persistence.feature"
          version="0.0.0"/>
 
@@ -606,13 +609,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osbp.gitinfo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.osbp.infogrid.api"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
index e088434..90cc941 100644
--- a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
+++ b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml
@@ -251,6 +251,12 @@
 			<version>1.1.0-SNAPSHOT</version>
 			<type>eclipse-feature</type>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.osbp.gitinfo</groupId>
+			<artifactId>org.eclipse.osbp.gitinfo.feature</artifactId>
+			<version>${project.version}</version>
+			<type>eclipse-feature</type>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/org.eclipse.osbp.softwarefactory.target.feature/pom.xml b/org.eclipse.osbp.softwarefactory.target.feature/pom.xml
index 6003ac0..b2c7f6a 100644
--- a/org.eclipse.osbp.softwarefactory.target.feature/pom.xml
+++ b/org.eclipse.osbp.softwarefactory.target.feature/pom.xml
@@ -140,19 +140,6 @@
             <classifier>sources-feature</classifier>
             <type>eclipse-feature</type>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.vaaclipse.addons</groupId>
-            <artifactId>org.eclipse.osbp.vaaclipse.addons.feature</artifactId>
-            <version>${project.version}</version>
-            <type>eclipse-feature</type>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.vaaclipse.addons</groupId>
-            <artifactId>org.eclipse.osbp.vaaclipse.addons.feature</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources-feature</classifier>
-            <type>eclipse-feature</type>
-        </dependency>
         
         <dependency>
         	<groupId>org.eclipse.osbp.ecview</groupId>