diff --git a/build.gradle b/build.gradle
index 6a40c52d..a8045a12 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ buildscript {
 	}
 	dependencies {
 		classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.5'
+		classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2'
 	}
 }
 
@@ -18,6 +19,7 @@ allprojects {
 
 	repositories {
 		maven { url 'http://repo.springsource.org/libs-release' }
+		maven { url 'http://repo.springsource.org/plugins-release' } // for bundlor
 	}
 }
 
@@ -28,6 +30,7 @@ subprojects { subproject ->
 	apply plugin: 'eclipse'
 	apply plugin: 'idea'
 	apply plugin: 'project-report'
+	apply plugin: 'bundlor'
 
 	// ensure JDK 5 compatibility (GRADLE-18; INT-1578)
 	sourceCompatibility=1.5
@@ -107,6 +110,18 @@ subprojects { subproject ->
 		archives javadocJar
 	}
 
+	bundlor {
+		enabled = true
+		failOnWarnings = true
+		bundleManifestVersion = 2
+		bundleVendor = 'SpringSource'
+		bundleName = project.description
+		bundleVersion = project.version
+		importTemplate = [
+			'org.apache.log4j.*;version="['+log4jVersion+', 2.0.0)"'
+		]
+	}
+
 }
 
 project('spring-amqp-core') {
@@ -120,6 +135,23 @@ project('spring-amqp-core') {
 		compile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
 
 	}
+	bundlor {
+		bundleSymbolicName = 'org.springframework.amqp'
+		importTemplate += [
+			'javax.xml.transform;version="0"',
+			'javax.xml.transform.stream;version="0"',
+			'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+			'org.codehaus.jackson;version="[1.4.3, 2.0.0)";resolution:="optional"',
+			'org.codehaus.jackson.map;version="[1.4.3, 2.0.0)";resolution:="optional"',
+			'org.codehaus.jackson.map.type;version="[1.4.3, 2.0.0)";resolution:="optional"',
+			'org.codehaus.jackson.type;version="[1.4.3, 2.0.0)";resolution:="optional"',
+			'org.springframework.beans.factory;version="[3.0.5, 4.0.0)"',
+			'org.springframework.core.serializer;version="[3.0.5, 4.0.0)"',
+			'org.springframework.oxm;version="[3.0.5, 4.0.0)"',
+			'org.springframework.remoting.rmi;version="[3.0.5, 4.0.0)"',
+			'org.springframework.util;version="[3.0.5, 4.0.0)"'
+		]
+	}
 
 }
 
@@ -134,6 +166,15 @@ project('spring-erlang') {
 		compile "org.erlang.otp:jinterface:$erlangOtpVersion"
 
 	}
+	bundlor {
+		bundleSymbolicName = 'org.springframework.erlang'
+		importTemplate += [
+			'com.ericsson.otp.erlang;version="0"',
+			'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+			'org.springframework.beans.factory;version="[3.0.5, 4.0.0)"',
+			'org.springframework.util;version="[3.0.5, 4.0.0)"'
+		]
+	}
 
 }
 
@@ -161,6 +202,48 @@ project('spring-rabbit') {
 		}
 
 	}
+	bundlor {
+		bundleSymbolicName = 'org.springframework.amqp.rabbit'
+		importTemplate += [
+			'com.rabbitmq.client;version="[2.5.0, 3.0.0)"',
+			'com.rabbitmq.utility;version="[2.5.0, 3.0.0)"',
+			'org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:="optional"',
+			'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+			'org.apache.log4j;version="['+log4jVersion+', 1.3.0)";resolution:="optional"',
+			'org.apache.log4j.spi;version="['+log4jVersion+', 1.3.0)";resolution:="optional"',
+
+			// change these for each release
+			'org.springframework.amqp;version="[1.1.2, 1.1.3)"',
+			'org.springframework.amqp.core;version="[1.1.2, 1.1.3)"',
+			'org.springframework.amqp.support.converter;version="[1.1.2, 1.1.3)"',
+
+			'org.springframework.aop;version="[3.0.5, 4.0.0)"',
+			'org.springframework.aop.framework;version="[3.0.5, 4.0.0)"',
+			'org.springframework.aop.support;version="[3.0.5, 4.0.0)"',
+			'org.springframework.beans;version="[3.0.5, 4.0.0)"',
+			'org.springframework.beans.factory;version="[3.0.5, 4.0.0)"',
+			'org.springframework.beans.factory.config;version="[3.0.5, 4.0.0)"',
+			'org.springframework.beans.factory.parsing;version="[3.0.5, 4.0.0)"',
+			'org.springframework.beans.factory.support;version="[3.0.5, 4.0.0)"',
+			'org.springframework.beans.factory.xml;version="[3.0.5, 4.0.0)"',
+			'org.springframework.context;version="[3.0.5, 4.0.0)"',
+			'org.springframework.core;version="[3.0.5, 4.0.0)"',
+			'org.springframework.core.task;version="[3.0.5, 4.0.0)"',
+			'org.springframework.jmx.export.annotation;version="[3.0.5, 4.0.0)"',
+			'org.springframework.jmx.support;version="[3.0.5,4.0.0)"',
+			'org.springframework.retry;version="[1.0.0, 1.1.0)";resolution:="optional"',
+			'org.springframework.retry.interceptor;version="[1.0.1, 1.1.0)";resolution:="optional"',
+			'org.springframework.retry.policy;version="[1.0.1, 1.1.0)";resolution:="optional"',
+			'org.springframework.retry.support;version="[1.0.1, 1.1.0)";resolution:="optional"',
+			'org.springframework.scheduling.concurrent;version="[3.0.5, 4.0.0)"',
+			'org.springframework.transaction;version="[3.0.5, 4.0.0)"',
+			'org.springframework.transaction.interceptor;version="[3.0.5, 4.0.0)"',
+			'org.springframework.transaction.support;version="[3.0.5, 4.0.0)"',
+			'org.springframework.util;version="[3.0.5, 4.0.0)"',
+			'org.springframework.util.xml;version="[3.0.5, 4.0.0)"',
+			'org.w3c.dom;version="0"'
+		]
+	}
 
 }