diff --git a/compatibility-client/bnd.bnd b/compatibility-client/bnd.bnd
new file mode 100644
index 00000000000..51ad66e121c
--- /dev/null
+++ b/compatibility-client/bnd.bnd
@@ -0,0 +1,8 @@
+Bundle-SymbolicName: ${project.groupId}.compatibility-client
+Bundle-Name: Vaadin Compatibility Client
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
+Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\
+    javax.validation*;resolution:=optional;version='${javax.validation.version}',\
+    *
+Export-Package: com.vaadin.v7.client*;-noimport:=true
diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml
index 47d52432b69..32ad5e59453 100644
--- a/compatibility-client/pom.xml
+++ b/compatibility-client/pom.xml
@@ -38,12 +38,19 @@
 
     <build>
         <plugins>
+
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
                         <index>false</index>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>