diff --git a/extras/pom.xml b/extras/pom.xml
index ded96562d..a408eacb0 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>shindig-extras</artifactId>
   <version>2.5.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>Apache Shindig Extra Modules</name>
   <description>Provides extra, deprecated or extended functionality. The items here have unstable APIs and could change at any time.</description>
diff --git a/features/pom.xml b/features/pom.xml
index 5f904b074..e34de7e8b 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>shindig-features</artifactId>
   <version>2.5.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>Apache Shindig Features</name>
   <description>Packages all the features that shindig provides into a single jar file to allow
diff --git a/java/common/pom.xml b/java/common/pom.xml
index f09ed6c84..e4172aa90 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>shindig-common</artifactId>
   <version>2.5.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>Apache Shindig Common Code</name>
   <description>Common java code for Shindig</description>
@@ -39,6 +39,18 @@
     <url>http://svn.apache.org/viewvc/shindig/trunk/java/common</url>
   </scm>
 
+  <properties>
+    <osgi.export>
+      org.apache.shindig.auth*,
+      org.apache.shindig.common*,
+      org.apache.shindig.config*,
+      org.apache.shindig.expressions*,
+      org.apache.shindig.protocol*,
+      org.apache.shindig.common.cache.ehcache*,
+      org.apache.shindig.common.logging.i18n,
+    </osgi.export>
+  </properties>
+
   <build>
     <resources>
       <resource>
diff --git a/java/gadgets/pom.xml b/java/gadgets/pom.xml
index a5429439a..7710f5f25 100644
--- a/java/gadgets/pom.xml
+++ b/java/gadgets/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>shindig-gadgets</artifactId>
   <version>2.5.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>Apache Shindig Gadget Renderer</name>
   <description>Renders gadgets, provides the gadget metadata service, and serves
@@ -40,6 +40,20 @@
     <url>http://svn.apache.org/viewvc/shindig/trunk/java/gadgets</url>
   </scm>
 
+  <properties>
+    <osgi.export>
+      org.apache.shindig.gadgets*,
+    </osgi.export>
+    <osgi.import>
+      com.sun.imageio.plugins.jpeg;resolution:=optional,
+      org.apache.shindig.common.logging.i18n,
+      org.kohsuke.args4j,
+      org.json.simple,
+      org.xmlpull.v1,
+      *
+    </osgi.import>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
diff --git a/java/sample-container/pom.xml b/java/sample-container/pom.xml
index f6e002a57..613ac4705 100644
--- a/java/sample-container/pom.xml
+++ b/java/sample-container/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>shindig-sample-container</artifactId>
   <version>2.5.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>Apache Shindig Sample Container</name>
   <description>Default Shindig Sample Container module</description>
@@ -39,6 +39,13 @@
     <url>http://svn.apache.org/viewvc/shindig/trunk/java/server</url>
   </scm>
 
+  <properties>
+    <osgi.export>
+      org.apache.shindig.sample.container*,
+      org.apache.shindig.sample.shiro*
+    </osgi.export>
+  </properties>
+
   <dependencies>
     <!-- project dependencies -->
     <dependency>
diff --git a/java/social-api/pom.xml b/java/social-api/pom.xml
index b0bfd7e93..eb9338b31 100644
--- a/java/social-api/pom.xml
+++ b/java/social-api/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>shindig-social-api</artifactId>
   <version>2.5.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>Apache Shindig Social API</name>
   <description>Serves OpenSocial Data and the RESTful APIs.</description>
@@ -39,6 +39,25 @@
     <url>http://svn.apache.org/viewvc/shindig/trunk/java/social-api</url>
   </scm>
 
+  <properties>
+    <osgi.import>
+      org.joda.time,
+      org.joda.time.format,
+      com.thoughtworks.xstream*,
+      com.thoughtworks.xstream.converters,
+      com.thoughtworks.xstream.converters.enums,
+      com.thoughtworks.xstream.converters.basic,
+      com.thoughtworks.xstream.converters.extended,
+      com.thoughtworks.xstream.converters.*,
+      *
+    </osgi.import>
+    <osgi.export>
+      org.apache.shindig.social.core*,
+      org.apache.shindig.social.opensocial*,
+      org.apache.shindig.social.sample*,
+    </osgi.export>
+  </properties>
+
   <build>
     <resources>
       <resource>
diff --git a/pom.xml b/pom.xml
index f0baa2023..9731030eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,9 @@
     <shindig.jdk.version>1.6</shindig.jdk.version>
     <shindig.jdk.javadoc>1.6.0</shindig.jdk.javadoc>
     <shindig.jdk.classifier />
+
+    <osgi.import>*</osgi.import>
+    <osgi.export></osgi.export>
   </properties>
 
   <prerequisites>
@@ -1256,6 +1259,11 @@
           <artifactId>maven-jetty-plugin</artifactId>
           <version>6.1.26</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.3.7</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.geronimo.genesis.plugins</groupId>
           <artifactId>tools-maven-plugin</artifactId>
@@ -1393,6 +1401,17 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Import-Package>${osgi.import}</Import-Package>
+            <Export-Package>${osgi.export}</Export-Package>
+          </instructions>
+        </configuration>
+        <extensions>true</extensions>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.rat</groupId>