diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index d6418d085a9..c203a046318 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -21,7 +21,22 @@
 	<dependencies>
 		<!-- compile dependencies -->
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
-
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile" />
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile" />
+		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile" />
+		<dependency org="org.springframework" name="org.springframework.agent" rev="latest.integration" conf="compile->compile" />
+		<!-- optional dependencies -->
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional->compile" />
+		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.1.0" conf="optional->compile" />
+		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.5.1" conf="optional->compile" />
+		<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional->compile" />
+		<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.1.0" conf="optional->compile" />
+		<dependency org="com.sun.enterprise" name="com.springsource.com.sun.enterprise.loader" rev="1.0.0" conf="optional->compile" />
+		<dependency org="com.oracle.oc4j" name="com.springsource.oracle.classloader" rev="10.1.3.1" conf="optional->compile" />
+		<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="optional->compile" />
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional->compile" />
+		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="optional->compile" />
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->compile" />
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index e992eb7ad3c..a1550ca873b 100644
--- a/org.springframework.context/template.mf
+++ b/org.springframework.context/template.mf
@@ -2,5 +2,46 @@ Bundle-SymbolicName: org.springframework.context
 Bundle-Name: Spring Context
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
+Import-Package: 
+ javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional,
+ org.springframework.orm.jpa.support;version="[2.5.5.A, 2.5.5.A]";resolution:=optional
 Import-Template: 
- org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,
+ com.sun.enterprise.loader.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ com.sun.net.*;resolution:=optional,
+ edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional,
+ javax.annotation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional,
+ net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
+ oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional,
+ org.aopalliance.*;version="[1.0.0, 2.0.0)",
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
+ org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional,
+ org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]",
+ org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
+ org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
+ org.springframework.instrument.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
+ org.springframework.metadata.*;version="[2.5.5.A, 2.5.5.A]",
+ org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]"
+Unversioned-Imports: 
+ com.sun.net.*,
+ javax.management.*,
+ javax.naming.*,
+ javax.rmi.*,
+ javax.xml.namespace.*,
+ org.omg.CORBA.*,
+ org.omg.CORBA_2_3.*,
+ org.w3c.dom.*,
+ org.xml.sax.*
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool