diff --git a/org.springframework.integration.adapter/template.mf b/org.springframework.integration.adapter/template.mf
index ccc07e7bf4..7fd36ac42d 100644
--- a/org.springframework.integration.adapter/template.mf
+++ b/org.springframework.integration.adapter/template.mf
@@ -7,15 +7,15 @@ Import-Template:
  org.springframework.beans.*;version="[2.5.4.A, 3.0.0)",
  org.springframework.context;version="[2.5.4.A, 3.0.0)",
  org.springframework.core.*;version="[2.5.4.A, 3.0.0)",
- org.springframework.jms.*;version="[2.5.4.A, 3.0.0)",
- org.springframework.mail.*;version="[2.5.4.A, 3.0.0)",
- org.springframework.remoting.*;version="[2.5.4.A, 3.0.0)",
+ org.springframework.jms.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
+ org.springframework.mail.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
+ org.springframework.remoting.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
  org.springframework.util;version="[2.5.4.A, 3.0.0)",
- org.springframework.web;version="[2.5.4.A, 3.0.0)",
+ org.springframework.web;version="[2.5.4.A, 3.0.0)";resolution:=optional,
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.apache.commons.net.ftp;version="[1.4.1,2.0.0)",
- javax.mail.*;version="[1.4.0,2.0.0)",
- javax.jms;version="[1.1.0,2.0.0)",
- javax.servlet.*;version="[2.4.0,3.0.0)"
+ org.apache.commons.net.ftp;version="[1.4.1,2.0.0)";resolution:=optional,
+ javax.mail.*;version="[1.4.0,2.0.0)";resolution:=optional,
+ javax.jms;version="[1.1.0,2.0.0)";resolution:=optional,
+ javax.servlet.*;version="[2.4.0,3.0.0)";resolution:=optional
 Unversioned-Imports: 
  org.w3c.dom
diff --git a/org.springframework.integration.ws/template.mf b/org.springframework.integration.ws/template.mf
index b761522fbe..b3b1ddd9d1 100644
--- a/org.springframework.integration.ws/template.mf
+++ b/org.springframework.integration.ws/template.mf
@@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[1.0.0, 1.0.0]",
  org.springframework.beans.factory.*;version="[2.5.4.A, 3.0.0)",
- org.springframework.oxm;version="[1.5.1.A, 2.0.0)",
+ org.springframework.oxm;version="[1.5.1.A, 2.0.0)";resolution:=optional,
  org.springframework.util;version="[2.5.4.A, 3.0.0)",
  org.springframework.ws.*;version="[1.5.1.A, 2.0.0)",
  org.springframework.xml.transform;version="[1.5.1.A, 2.0.0)"