diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ab4bdb037e..ca5a9b823d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -30,6 +30,8 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 ////
 
 === Unreleased
+===== Features
+* Add support for deploying the API in OSGi containers - {pull}3345[#3345]
 
 [[release-notes-1.x]]
 === Java Agent version 1.x
diff --git a/apm-agent-api/pom.xml b/apm-agent-api/pom.xml
index c8769a1c6b..51fc6b942c 100644
--- a/apm-agent-api/pom.xml
+++ b/apm-agent-api/pom.xml
@@ -53,12 +53,33 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>${project.groupId}.api</Automatic-Module-Name>
-                        </manifestEntries>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bnd-process</id>
+                        <goals>
+                            <goal>bnd-process</goal>
+                        </goals>
+                        <configuration>
+                            <bnd><![CDATA[
+                        Automatic-Module-Name: ${project.groupId}.api
+
+                        Import-Package: javax.annotation;version=0.0.0,*
+
+                        <!-- Export all non-internal packages by default -->
+                        Export-Package: co.elastic.apm.api.*,!*.impl.*,!*.internal.*
+                            ]]>
+                            </bnd>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>