diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..ea7e55d
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+# export all versioned packages except for conditional ones
+-exportcontents: ${removeall;${packages;VERSIONED};${packages;CONDITIONAL}}
diff --git a/pom.xml b/pom.xml
index 30688a7..d8e9961 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,31 @@
           <target>1.8</target>
         </configuration>
       </plugin>
+
+      <!-- Use the bnd-maven-plugin to generate the OSGi manifest -->
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <version>6.3.1</version>
+        <executions>
+          <execution>
+            <id>bnd-process</id>
+            <goals>
+              <goal>bnd-process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- configure the jar plugin to use the manifest generated by the bnd-maven-plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   
@@ -152,6 +177,11 @@
   </profiles>
   
   <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.versioning</artifactId>
+      <version>1.1.2</version>
+    </dependency>
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
diff --git a/src/main/java/ua_parser/package-info.java b/src/main/java/ua_parser/package-info.java
new file mode 100644
index 0000000..40aef2c
--- /dev/null
+++ b/src/main/java/ua_parser/package-info.java
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2012 Twitter, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@org.osgi.annotation.versioning.Version("1.0.0")
+package ua_parser;