diff --git a/build-spring-integration/publish.xml b/build-spring-integration/publish.xml
index cf5da83c77..e02d3a5349 100644
--- a/build-spring-integration/publish.xml
+++ b/build-spring-integration/publish.xml
@@ -19,6 +19,7 @@
 		<pathelement location="${basedir}/../org.springframework.integration.stream"/>
 		<pathelement location="${basedir}/../org.springframework.integration.udp"/>
 		<pathelement location="${basedir}/../org.springframework.integration.ws"/>
+  	    <pathelement location="${basedir}/../org.springframework.integration.osgi"/>
   </path>
 
   <path id="modules-with-only-pom-artifacts">
diff --git a/org.springframework.integration.osgi/.classpath b/org.springframework.integration.osgi/.classpath
new file mode 100644
index 0000000000..b8a5737c27
--- /dev/null
+++ b/org.springframework.integration.osgi/.classpath
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.100.v20090629/org.eclipse.osgi-3.5.100.v20090629.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.file"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.test/1.2.0/org.springframework.osgi.test-1.2.0.jar" sourcepath="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.test/1.2.0/org.springframework.osgi.test-sources-1.2.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.0/org.springframework.osgi.core-1.2.0.jar" sourcepath="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.0/org.springframework.osgi.core-sources-1.2.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.0/org.springframework.osgi.io-1.2.0.jar" sourcepath="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.0/org.springframework.osgi.io-sources-1.2.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-3.1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.mock/1.2.0/org.springframework.osgi.mock-1.2.0.jar" sourcepath="IVY_CACHE/org.springframework.osgi/org.springframework.osgi.mock/1.2.0/org.springframework.osgi.mock-sources-1.2.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.event"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC1/org.springframework.aop-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC1/org.springframework.aop-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.springframework.integration.osgi/.project b/org.springframework.integration.osgi/.project
new file mode 100644
index 0000000000..30de144f70
--- /dev/null
+++ b/org.springframework.integration.osgi/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.integration.osgi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.springframework.integration.osgi/build.xml b/org.springframework.integration.osgi/build.xml
new file mode 100644
index 0000000000..afbe9fa38c
--- /dev/null
+++ b/org.springframework.integration.osgi/build.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.integration.osgi">
+
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
+	<import file="${basedir}/../build-spring-integration/generate-pom.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
+
+</project>
diff --git a/org.springframework.integration.osgi/ivy.xml b/org.springframework.integration.osgi/ivy.xml
new file mode 100644
index 0000000000..49b34cf87b
--- /dev/null
+++ b/org.springframework.integration.osgi/ivy.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework.integration.osgi" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Oleg Zhurakousky"/>
+	</info>
+ 
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="${spring.version}" conf="compile->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="compile->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.3.RELEASE" conf="test->runtime"/>
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.5.0.v20090311-1300" conf="compile->runtime"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration.file" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.osgi" name="org.springframework.osgi.test" rev="1.2.0" conf="compile->compile"/>
+		<dependency org="org.springframework.osgi" name="org.springframework.osgi.mock" rev="1.2.0" conf="compile->compile"/>
+		<dependency org="org.springframework.osgi" name="org.springframework.osgi.io" rev="1.2.0" conf="compile->compile"/>
+		<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="1.2.0" conf="compile->compile"/>
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration.event" rev="latest.integration" conf="compile->compile"/>
+	</dependencies>
+
+</ivy-module>
\ No newline at end of file
diff --git a/org.springframework.integration.osgi/src/main/resources/META-INF/spring.handlers b/org.springframework.integration.osgi/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 0000000000..9b37098145
--- /dev/null
+++ b/org.springframework.integration.osgi/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/integration-bus=org.springframework.integration.osgi.config.xml.IntegrationOSGiNamespaceHandler
\ No newline at end of file
diff --git a/org.springframework.integration.osgi/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.osgi/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 0000000000..1083efd130
--- /dev/null
+++ b/org.springframework.integration.osgi/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/integration-bus/spring-integration-bus-1.0.xsd=org/springframework/integration/osgi/config/xml/spring-integration-bus-1.0.xsd
diff --git a/org.springframework.integration.osgi/src/main/resources/org/springframework/integration/osgi/config/xml/spring-integration-bus-1.0.xsd b/org.springframework.integration.osgi/src/main/resources/org/springframework/integration/osgi/config/xml/spring-integration-bus-1.0.xsd
new file mode 100644
index 0000000000..ca61592e32
--- /dev/null
+++ b/org.springframework.integration.osgi/src/main/resources/org/springframework/integration/osgi/config/xml/spring-integration-bus-1.0.xsd
@@ -0,0 +1,26 @@
+<xsd:schema xmlns="http://www.springframework.org/schema/integration-bus"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:tool="http://www.springframework.org/schema/tool"
+	targetNamespace="http://www.springframework.org/schema/integration-bus"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+
+	<xsd:element name="osgi">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation>
+					Auto-exports SI artifacts as OSGi services
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:attribute name="group-name" type="xsd:string" default="DEFAULT_CONTROL_GROUP">
+				<xsd:annotation>
+					<xsd:documentation>
+						Identified group-name of a Message Broker this configuration will be connected to.
+				</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+</xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.integration.osgi/src/test/resources/log4j.xml b/org.springframework.integration.osgi/src/test/resources/log4j.xml
new file mode 100644
index 0000000000..d964b5cc46
--- /dev/null
+++ b/org.springframework.integration.osgi/src/test/resources/log4j.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appenders -->
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+		</layout>
+	</appender>
+
+	
+	<logger name="org.springframework.osgi">
+		<level value="trace" />
+	</logger>
+
+	<logger name="org.springframework.integration">
+		<level value="debug" />
+	</logger>
+ 
+	<!-- Root Logger -->
+	<root>
+		<priority value="warn" />
+		<appender-ref ref="console" />
+	</root>
+
+</log4j:configuration>
\ No newline at end of file
diff --git a/org.springframework.integration.osgi/template.mf b/org.springframework.integration.osgi/template.mf
new file mode 100644
index 0000000000..8b8951662b
--- /dev/null
+++ b/org.springframework.integration.osgi/template.mf
@@ -0,0 +1,12 @@
+Bundle-SymbolicName: org.springframework.integration.osgi
+Bundle-Name: Spring Integration OSGi Extender
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template: org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ com.sun.*;version="0",
+ javax.xml.*;version="0",
+ org.apache.commons.logging.*;version="1.1.1",
+ org.springframework.*;version="[3.0.0,4.0.0)",
+ org.w3c.dom.*;version="0"
+ 
+ 
\ No newline at end of file