diff --git a/pom.xml b/pom.xml
index ef28a2ef1..73972932c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,9 +160,7 @@
 						<configuration>
 							<finalName>${project.artifactId}-${project.version}.jre7</finalName>
 							<archive>
-								<manifest>
-									<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-								</manifest>
+								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 							</archive>
 						</configuration>
 					</plugin>   
@@ -196,9 +194,7 @@
 						<configuration>
 							<finalName>${project.artifactId}-${project.version}.jre8</finalName>
 							<archive>
-								<manifest>
-									<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-								</manifest>
+								<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 							</archive>
 						</configuration>
 					</plugin>
@@ -263,7 +259,28 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+			<!-- Create OSGI Headers -->
+           	<plugin>
+           		<groupId>org.apache.felix</groupId>
+       			<artifactId>maven-bundle-plugin</artifactId>
+       			<version>3.2.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                    	<Export-Package>com.microsoft.sqlserver.jdbc,microsoft.sql</Export-Package>
+                    	<Import-Package>!microsoft.sql,*</Import-Package>
+                    </instructions>
+                </configuration>
+                	<executions>
+				    	<execution>
+				      		<id>bundle-manifest</id>
+				      		<phase>process-classes</phase>
+				      		<goals>    
+				        		<goal>manifest</goal>
+				      		</goals>   
+				    	</execution>
+				  	</executions>
+         	</plugin>  			
 		</plugins>
 	</build>
 </project>