diff --git a/acl/pom.xml b/acl/pom.xml
index 11939939d9..f7305edcb8 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -58,4 +58,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/acl/template.mf b/acl/template.mf
new file mode 100644
index 0000000000..37e7026d69
--- /dev/null
+++ b/acl/template.mf
@@ -0,0 +1,21 @@
+Bundle-SymbolicName: org.springframework.security.acls
+Bundle-Name: Spring Security Acls
+Bundle-Vendor: SpringSource
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Ignored-Existing-Headers: 
+ Import-Package,
+ Export-Package
+Import-Template: 
+ org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
+ org.springframework.security.core.*;version="[${version}, 3.1.0)",
+ org.springframework.security.access.*;version="[${version}, 3.1.0)",
+ org.springframework.security.util.*;version="[${version}, 3.1.0)",
+ org.springframework.context.*;version="[3.0.0, 3.1.0)";resolution:=optional, 
+ org.springframework.dao.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.jdbc.core.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.transaction.support.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.util.*;version="[3.0.0, 3.1.0)";resolution:=optional, 
+ net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional 
+ 
\ No newline at end of file
diff --git a/config/pom.xml b/config/pom.xml
index 98c711304e..6f34aac0f4 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -107,4 +107,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/config/template.mf b/config/template.mf
new file mode 100644
index 0000000000..b6c0a6bb07
--- /dev/null
+++ b/config/template.mf
@@ -0,0 +1,23 @@
+Bundle-SymbolicName: org.springframework.security.config
+Bundle-Name: Spring Security Namespace Configuration
+Bundle-Vendor: SpringSource
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Ignored-Existing-Headers: 
+ Import-Package,
+ Export-Package
+Import-Template: 
+ org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", 
+ org.springframework.security.access.*;version="[${version}, 3.1.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
+ org.springframework.security.core.*;version="[${version}, 3.1.0)", 
+ org.springframework.security.util;version="[${version}, 3.1.0)",
+ org.springframework.security.web.*;version="[${version}, 3.1.0)";resolution:=optional,
+ org.springframework.aop.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.beans.*;version="[3.0.0, 3.1.0)",
+ org.springframework.context.*;version="[3.0.0, 3.1.0)",
+ org.springframework.core.*;version="[3.0.0, 3.1.0)",
+ org.springframework.util.*;version="[3.0.0, 3.1.0)",
+ javax.servlet;version="0";resolution:=optional,
+ javax.naming.directory;version="0";resolution:=optional,
+ org.w3c.dom;version="0";resolution:=optional
diff --git a/core/template.mf b/core/template.mf
index e90cb06f3c..38c17de843 100644
--- a/core/template.mf
+++ b/core/template.mf
@@ -8,24 +8,23 @@ Ignored-Existing-Headers:
  Export-Package
 Import-Template: 
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
- org.aspectj.*;version="[1.5.2,1.7.0)";resolution:=optional,
+ org.aspectj.*;version="[1.5.2, 1.7.0)";resolution:=optional,
+ org.apache.commons.codec.*;version="[1.3, 2.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
  org.jaxen.*;version="[1.1.1, 1.2.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.1.0)",
+ org.springframework.aop.*;version="[3.0.0, 3.1.0)";resolution:=optional,
  org.springframework.beans.*;version="[3.0.0, 3.1.0)",
  org.springframework.context.*;version="[3.0.0, 3.1.0)",
  org.springframework.core.*;version="[3.0.0, 3.1.0)",
- org.springframework.expression.*;version="[3.0.0, 3.1.0)",
- org.springframework.remoting.*;version="[3.0.0, 3.1.0)",
- org.apache.commons.codec.*;version="[1.3, 2.0)";resolution:=optional,
- org.apache.commons.lang.*;version="[2.1, 3.0)";resolution:=optional,
+ org.springframework.expression.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.remoting.*;version="[3.0.0, 3.1.0)";resolution:=optional,
  org.springframework.dao.*;version="[3.0.0, 3.1.0)";resolution:=optional,
  org.springframework.jdbc.*;version="[3.0.0, 3.1.0)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
+ org.springframework.util;version="[3.0.0, 3.1.0)",
+ net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional, 
  org.w3c.dom;version="0";resolution:=optional,
- org.xml.sax;version="0";resolution:=optional,
+ org.xml.sax;version="0";resolution:=optional, 
  javax.annotation.security.*;version="0";resolution:=optional,
  javax.crypto.*;version="0";resolution:=optional,
  javax.xml.*;version="0";resolution:=optional,
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 735fc37cda..22a9253175 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -58,4 +58,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/ldap/template.mf b/ldap/template.mf
new file mode 100644
index 0000000000..64a2d80fe6
--- /dev/null
+++ b/ldap/template.mf
@@ -0,0 +1,23 @@
+Bundle-SymbolicName: org.springframework.security.ldap
+Bundle-Name: Spring Security LDAP
+Bundle-Vendor: SpringSource
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Ignored-Existing-Headers: 
+ Import-Package,
+ Export-Package
+Import-Template: 
+ org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
+ org.apache.directory.server.*;version="[1.0.2, 1.5)";resolution:=optional,
+ org.springframework.ldap.*;version="[1.3.0,1.4.0)",
+ org.springframework.security.core.*;version="[${version}, 3.1.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
+ org.springframework.security.provisioning.*;version="[${version}, 3.1.0)",
+ org.springframework.security.util;version="[${version}, 3.1.0)", 
+ org.springframework.beans.*;version="[3.0.0, 3.1.0)",
+ org.springframework.context.*;version="[3.0.0, 3.1.0)", 
+ org.springframework.core.io.*;version="[3.0.0, 3.1.0)",
+ org.springframework.dao.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.util.*;version="[3.0.0, 3.1.0)",
+ javax.naming.*;version="0";resolution:=optional
+ 
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 14e0a46867..a4794f62a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,6 +334,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.3</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/web/pom.xml b/web/pom.xml
index bea350e9b8..7794d2b0a1 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -54,4 +54,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/web/template.mf b/web/template.mf
new file mode 100644
index 0000000000..8df9f48953
--- /dev/null
+++ b/web/template.mf
@@ -0,0 +1,34 @@
+Bundle-SymbolicName: org.springframework.security.web
+Bundle-Name: Spring Security Web
+Bundle-Vendor: SpringSource
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Excluded-Exports: 
+ org.springframework.security.web.authentication.preauth.websphere
+Excluded-Imports: 
+ javax.naming.*,
+ javax.rmi.*,
+ javax.sql.*,
+ javax.security.auth.*,
+ org.aopalliance.*
+Ignored-Existing-Headers: 
+ Import-Package,
+ Export-Package
+Import-Template: 
+ org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
+ org.apache.commons.codec.*;version="[1.3, 2.0)";resolution:=optional,
+ org.springframework.security.core.*;version="[${version}, 3.1.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
+ org.springframework.security.access.*;version="[${version}, 3.1.0)",
+ org.springframework.security.util;version="[${version}, 3.1.0)",
+ org.springframework.beans.*;version="[3.0.0, 3.1.0)",
+ org.springframework.context.*;version="[3.0.0, 3.1.0)",
+ org.springframework.core;version="[3.0.0, 3.1.0)",
+ org.springframework.dao;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.expression;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.expression.spel.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.jdbc.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.mock.web;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.web.context.*;version="[3.0.0, 3.1.0)";resolution:=optional,
+ org.springframework.util;version="[3.0.0, 3.1.0)";resolution:=optional,
+ javax.servlet.*;version="0"
\ No newline at end of file