diff --git a/pom.xml b/pom.xml
index 364e9d91f..ace2579c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
 		<module>spring-data-graph-parent</module>
 		<module>spring-data-graph-core</module>
 		<module>spring-data-neo4j</module>
-		<module>spring-data-neo4j-roo</module>
 		<module>spring-data-neo4j-rest</module>
 	</modules>
 
diff --git a/spring-data-graph-core/pom.xml b/spring-data-graph-core/pom.xml
index d07d14c07..447e05efa 100644
--- a/spring-data-graph-core/pom.xml
+++ b/spring-data-graph-core/pom.xml
@@ -85,4 +85,12 @@
 		</dependency>
 
 	</dependencies>
+    <build>
+        <plugins>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+			</plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/spring-data-graph-core/template.mf b/spring-data-graph-core/template.mf
new file mode 100644
index 000000000..1f7b0b6c1
--- /dev/null
+++ b/spring-data-graph-core/template.mf
@@ -0,0 +1,17 @@
+Bundle-SymbolicName: org.springframework.data.graph
+Bundle-Name: Spring Data Graph
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Package:
+ sun.reflect;version="0";resolution:=optional
+Import-Template:
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.dao.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.persistence.*;version="[1.0.0, 2.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.w3c.dom.*;version="0"
\ No newline at end of file
diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index d4996b07a..0f6ff8068 100644
--- a/spring-data-graph-parent/pom.xml
+++ b/spring-data-graph-parent/pom.xml
@@ -398,6 +398,35 @@
                   </mapping>
                 </configuration>
             </plugin>
+                    <plugin>
+                        <!--
+                            configures the springsource bundlor plugin, which generates
+                            OSGI-compatible MANIFEST.MF files during the 'compile' phase of
+                            the maven build. this plugin is declared within the
+                            pluginManagement section because not every module that inherits
+                            from this pom needs bundlor's services, e.g.:
+                            spring-integration-samples and all its children. for this reason,
+                            all modules that wish to use bundlor must declare it explicitly.
+                            it is not necessary to specify the <version> or <configuration>
+                            sections, but groupId and artifactId are required. see
+                            http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
+                            for more info
+                        -->
+                        <groupId>com.springsource.bundlor</groupId>
+                        <artifactId>com.springsource.bundlor.maven</artifactId>
+                        <version>1.0.0.RELEASE</version>
+                        <configuration>
+                            <failOnWarnings>true</failOnWarnings>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>bundlor</id>
+                                <goals>
+                                    <goal>bundlor</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
 		</plugins>
 	</build>
 	<pluginRepositories>
diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml
index aad1eae0f..aab05f0e1 100644
--- a/spring-data-neo4j-rest/pom.xml
+++ b/spring-data-neo4j-rest/pom.xml
@@ -154,6 +154,10 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
new file mode 100644
index 000000000..6e8351955
--- /dev/null
+++ b/spring-data-neo4j-rest/template.mf
@@ -0,0 +1,21 @@
+Bundle-SymbolicName: org.springframework.data.neo4j
+Bundle-Name: Spring Data Neo4J
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Package:
+ sun.reflect;version="0";resolution:=optional
+Import-Template:
+ org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.annotation.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.graph.*;version="0",
+ org.neo4j.*;version="0",
+ org.w3c.dom.*;version="0",
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.apache.lucene.*;version="0",
+ javax.annotation.*;version="0";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ com.sun.jersey.api.*;version="0",
+ javax.ws.rs.core.*;version="0",
+ org.codehaus.jackson.*;version="0"
+Excluded-Exports:
+ org.neo4j.kernel
\ No newline at end of file
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index 586f47b8b..cd4b11118 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -250,6 +250,11 @@
                      </execution>
                    </executions>
                  </plugin>
+                    <plugin>
+                        <groupId>com.springsource.bundlor</groupId>
+                        <artifactId>com.springsource.bundlor.maven</artifactId>
+                    </plugin>
+
 		</plugins>
 	</build>
 </project>
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
new file mode 100644
index 000000000..e2610b2be
--- /dev/null
+++ b/spring-data-neo4j/template.mf
@@ -0,0 +1,32 @@
+Bundle-SymbolicName: org.springframework.data.neo4j
+Bundle-Name: Spring Data Neo4J
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Package:
+ sun.reflect;version="0";resolution:=optional
+Import-Template:
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.dao.*;version="[3.0.0, 4.0.0)",
+ org.springframework.jdbc.*;version="[3.0.0, 4.0.0)",
+ org.springframework.stereotype.*;version="[3.0.0, 4.0.0)",
+ org.springframework.orm.*;version="[3.0.0, 4.0.0)",
+ org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.data.*;version="[1.0.0, 2.0.0)",
+ org.springframework.persistence.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.graph.*;version="0",
+ org.neo4j.*;version="0",
+ org.w3c.dom.*;version="0",
+ org.aspectj.*;version="[1.6.5, 2.0.0)",
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.apache.commons.configuration.*;version="0",
+ org.objectweb.jotm.*;version="0",
+ org.apache.lucene.*;version="0",
+ javax.validation.*;version="0";resolution:=optional,
+ javax.annotation.*;version="0";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
+ javax.persistence.spi.*;version="[1.0.0, 3.0.0)";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional