diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 21ea83154..cb545674e 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -65,6 +65,7 @@
 
   <modules>
     <module>org.eclipse.jgit.feature</module>
+    <module>org.eclipse.jgit.source.feature</module>
     <module>org.eclipse.jgit.junit.feature</module>
     <module>org.eclipse.jgit.updatesite</module>
   </modules>
@@ -77,6 +78,16 @@
     </repository>
   </repositories>
 
+  <dependencies>
+    <!-- sources artifacts so that we can place them in the features -->
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit</artifactId>
+      <version>0.9.0-SNAPSHOT</version>
+      <classifier>sources</classifier>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
diff --git a/pom.xml b/pom.xml
index 60c4ed69a..fe9a8c095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.3</version>
+          <version>1.5</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -240,12 +240,41 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
+        <inherited>true</inherited>
         <executions>
           <execution>
             <id>attach-sources</id>
+            <phase>process-classes</phase>
             <goals>
               <goal>jar</goal>
             </goals>
+            <configuration>
+            <archive>
+              <manifestEntries>
+                <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                <Bundle-Name>${project.name} - Sources</Bundle-Name>
+                <Bundle-SymbolicName>${project.artifactId}.source;singleton:=true</Bundle-SymbolicName>
+                <Bundle-Vendor>Eclipse.org - JGit</Bundle-Vendor>
+                <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+                <Eclipse-SourceBundle>${project.artifactId};version="${parsedVersion.osgiVersion}";roots:="."</Eclipse-SourceBundle>
+               </manifestEntries>
+             </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Build helper maven plugin sets the parsedVersion.osgiVersion property -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>set-osgi-version</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
           </execution>
         </executions>
       </plugin>