diff --git a/driver/osgi.bnd b/driver/osgi.bnd
new file mode 100644
index 0000000000..4bd855ab52
--- /dev/null
+++ b/driver/osgi.bnd
@@ -0,0 +1,9 @@
+package-version=${version;===;${Bundle-Version}}
+
+Export-Package: \
+ !*.internal.*, \
+ *;version="${package-version}"
+
+Import-Package: \
+ *
+
diff --git a/driver/pom.xml b/driver/pom.xml
index 98ff214048..207b4403d0 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -6,6 +6,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build.revision></build.revision>
+    <bundle.name>${project.groupId}.${project.artifactId}</bundle.name>
+    <maven.build.timestamp.format>'v'yyyyMMdd-HHmm</maven.build.timestamp.format>
   </properties>
 
   <parent>
@@ -115,6 +117,16 @@
             <goals>
               <goal>jar</goal>
             </goals>
+            <configuration>
+              <archive>
+                  <manifestEntries>
+                      <Bundle-Name>${project.name} (Source)</Bundle-Name>
+                      <Bundle-SymbolicName>${bundle.name}.source</Bundle-SymbolicName>
+                      <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${build.timestamp}</Bundle-Version>
+                      <Eclipse-SourceBundle>${bundle.name};version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${build.timestamp}";roots:="."</Eclipse-SourceBundle>
+                  </manifestEntries>
+              </archive>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -144,6 +156,7 @@
         <configuration>
           <archive>
             <index>true</index>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <packageName>org/neo4j/driver</packageName>
             </manifest>
@@ -154,6 +167,47 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.12</version>
+        <executions>
+            <execution>
+                <id>set-osgi-version</id>
+                <phase>validate</phase>
+                <goals>
+                    <goal>parse-version</goal>
+                </goals>
+            </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>3.2.0</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${bundle.name}</Bundle-SymbolicName>
+            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${build.timestamp}</Bundle-Version>
+            <_snapshot>${maven.build.timestamp}</_snapshot>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            <_removeheaders>Bnd-*,Private-Package</_removeheaders>
+            <_nouses>true</_nouses>
+            <!-- each module can override these defaults in their osgi.bnd file -->
+            <_include>-osgi.bnd</_include>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>