diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index bea372a703..a14933f3ad 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -29,9 +29,26 @@
   </parent>
 
   <artifactId>activemq-core</artifactId>
+  <packaging>bundle</packaging>
   <name>ActiveMQ :: Core</name>
   <description>The ActiveMQ Message Broker and Client implementations</description>
 
+  <properties>
+    <activemq.osgi.import.pkg>
+      javax.jmdns*;resolution:=optional,
+      org.apache.activeio*;resolution:=optional,
+      org.apache.commons.pool*;resolution:=optional,
+      org.apache.derby*;resolution:=optional,
+      org.apache.tools.ant*;resolution:=optional,
+      org.apache.xbean*;resolution:=optional,
+      org.apache.xpath*;resolution:=optional,
+      org.codehaus.jam*;resolution:=optional,
+      org.springframework*;resolution:=optional,
+      org.w3c.dom.traversal*;resolution:=optional,
+      *
+    </activemq.osgi.import.pkg>
+  </properties>
+
   <dependencies>
 
     <!-- =============================== -->
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 6d70319ee1..015e5da96a 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -31,9 +31,14 @@
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
+  <packaging>bundle</packaging>
   <name>ActiveMQ :: JAAS</name>
   <description>A collection of generic JAAS Login Modules</description>
 
+  <properties>
+	<activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
+  </properties>
+
   <build>
     <plugins>
 
diff --git a/pom.xml b/pom.xml
index 6cdb001b45..167ee9c292 100755
--- a/pom.xml
+++ b/pom.xml
@@ -74,9 +74,18 @@
     <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
     <xstream-version>1.1.2</xstream-version>
     <xbean-version>3.2-SNAPSHOT</xbean-version>
+    <felix-version>1.0.0</felix-version>
     <dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</dist-repo-url>
     <m1-dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+    <!-- OSGi bundles properties -->
+    <activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
+    <activemq.osgi.export.pkg>org.apache.activemq*</activemq.osgi.export.pkg>
+    <activemq.osgi.private.pkg>!*</activemq.osgi.private.pkg>
+    <activemq.osgi.export>${activemq.osgi.export.pkg}*;version=${activemq.osgi.export.version}</activemq.osgi.export>
+    <activemq.osgi.export.version>${project.version}</activemq.osgi.export.version>
+    <activemq.osgi.import>${activemq.osgi.import.pkg}</activemq.osgi.import>
+    <activemq.osgi.symbolic.name>${groupId}.${artifactId}</activemq.osgi.symbolic.name>
   </properties>
   <prerequisites>
     <maven>2.0.4</maven>
@@ -978,6 +987,23 @@
             -->
           </archive>
         </configuration>
+      </plugin>
+	  <plugin>
+        <groupId>org.apache.felix</groupId>
+	    <artifactId>maven-bundle-plugin</artifactId>
+	    <version>${felix-version}</version>
+	    <extensions>true</extensions>
+	    <configuration>
+	      <instructions>
+	        <Bundle-Name>${artifactId}</Bundle-Name>
+	        <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
+	        <Export-Package>${activemq.osgi.export}</Export-Package>
+	        <Import-Package>${activemq.osgi.import}</Import-Package>
+	        <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
+	        <Implementation-Title>Apache ActiveMQ</Implementation-Title>
+	        <Implementation-Version>${project.version}</Implementation-Version>
+	      </instructions>
+	    </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-one-plugin</artifactId>