--- ./org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml.orig	2016-05-02 16:56:15.881504725 +0100
+++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml	2016-05-02 17:00:33.218156329 +0100
@@ -24,6 +24,7 @@
 
    <requires>
       <import plugin="org.eclipse.jgit"/>
+      <import plugin="com.google.gson" />
    </requires>
 
    <plugin
@@ -38,13 +39,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.gson"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/>
 
 </feature>
--- ./org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml.orig	2016-05-02 16:56:15.884504686 +0100
+++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml	2016-05-02 16:59:59.013601389 +0100
@@ -24,6 +24,7 @@
 
    <requires>
       <import plugin="com.jcraft.jsch"/>
+      <import plugin="org.apache.commons.logging" />
    </requires>
 
    <plugin
@@ -45,13 +46,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/>
 
 </feature>
--- ./org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml.orig	2016-05-02 16:56:15.886504660 +0100
+++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml	2016-05-02 16:59:28.769994911 +0100
@@ -22,6 +22,14 @@
       <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
    </url>
 
+   <requires>
+      <import plugin="com.jcraft.jsch" />
+      <import plugin="javaewah" />
+      <import plugin="org.apache.commons.compress" />
+      <import plugin="slf4j.api" />
+      <import plugin="slf4j.simple" />
+   </requires>
+
    <plugin
          id="org.eclipse.jgit"
          download-size="0"
@@ -34,49 +42,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.jcraft.jsch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javaewah"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.compress"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.slf4j.impl.log4j12"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.log4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/>
 
 </feature>
--- ./org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml.orig	2016-05-02 16:56:15.888504634 +0100
+++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml	2016-05-02 16:57:46.876320725 +0100
@@ -24,6 +24,8 @@
 
    <requires>
       <import plugin="org.eclipse.jgit"/>
+      <import plugin="org.apache.httpcomponents.httpclient" />
+      <import plugin="org.apache.httpcomponents.httpcore" />
    </requires>
 
    <plugin
@@ -31,20 +33,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.httpcomponents.httpcore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.httpcomponents.httpclient"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/>
 
 </feature>
--- ./org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml.orig	2016-05-02 16:56:15.890504608 +0100
+++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml	2016-05-02 16:57:17.671700728 +0100
@@ -33,6 +33,9 @@
    <requires>
       <import feature="org.eclipse.jgit" version="4.6.1" match="equivalent"/>
       <import feature="org.eclipse.jgit.lfs" version="4.6.1" match="equivalent"/>
+      <import plugin="org.apache.commons.compress" />
+      <import plugin="org.kohsuke.args4j" />
+      <import plugin="javaewah" />
    </requires>
 
    <plugin
@@ -49,25 +52,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.commons.compress"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.kohsuke.args4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javaewah"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>