diff --git a/core/pom.xml b/core/pom.xml
index 7702563b37..90ca7689f7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
         <artifactId>spring-security-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <artifactId>spring-security-core</artifactId>
     <name>Spring Security - Core</name>
 
@@ -140,24 +140,31 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/../</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>notice.txt</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-                <targetPath>/</targetPath>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${felix.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.springframework.security.*;version=${pom.version}</Export-Package>
+                        <Private-Package>!org.springframework.security.*</Private-Package>
+                        <Implementation-Title>${pom.name}</Implementation-Title>
+                        <Implementation-Version>${pom.version}</Implementation-Version>
+                        <Import-Package>
+                            org.springframework*;resolution:=optional;version="[2.0,2.5]",
+                        	*;resolution:=optional
+                        </Import-Package>
+<!--                         
+                        <Embed-Dependency>
+                        	*;scope=compile|runtime;inline=true
+                        </Embed-Dependency>
+ -->                        
+                    </instructions>
+                </configuration>
+            </plugin>            
+        </plugins>
     </build>
 
 </project>
diff --git a/pom.xml b/pom.xml
index e8aeed3b0e..d03b562def 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
     <description>Spring Security</description>
     <organization>
-        <name>Interface21, Inc</name>
+        <name>SpringSource, Inc</name>
         <url>http://sourceforge.net/projects/acegisecurity</url>
         <!--<logo>http://sourceforge.net/sflogo.php?group_id=104215&amp;type=5</logo>-->
     </organization>
@@ -244,7 +244,7 @@
                 <version>1.2.2</version>
             </extension>
         </extensions>
-        <plugins>
+        <plugins>            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-help-plugin</artifactId>
@@ -609,12 +609,12 @@
                 <scope>runtime</scope>
             </dependency>
         </dependencies>
-
     </dependencyManagement>
-    <properties>
+    <properties>        
         <spring.version>2.0.6</spring.version>
+        <felix.version>1.4.0</felix.version>
         <docbook.source>${basedir}/src/docbkx</docbook.source>
-        <docbook.target>${basedir}/target/site/guide</docbook.target>
+        <docbook.target>${basedir}/target/site/guide</docbook.target>        
     </properties>
 
 </project>