diff --git a/pom.xml b/pom.xml
index 2ce1e77d9..a34b58f29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.batch</groupId>
 	<artifactId>spring-batch</artifactId>
@@ -59,6 +60,7 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>2.5.5</spring.framework.version>
+		<bundlor.version>1.0.0.BUILD-SNAPSHOT</bundlor.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -73,7 +75,7 @@
 				<site>
 					<id>static.springframework.org</id>
 					<url>
-						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch
+						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch 
 					</url>
 				</site>
 			</distributionManagement>
@@ -114,7 +116,10 @@
 			<build>
 				<pluginManagement>
 					<plugins>
-						<!-- This seems to work better than the default (2008/03/19) because links on sub-module sites are not broken -->
+						<!--
+							This seems to work better than the default (2008/03/19) because
+							links on sub-module sites are not broken
+						-->
 						<plugin>
 							<artifactId>maven-site-plugin</artifactId>
 							<version>2.0-beta-7-SNAPSHOT</version>
@@ -123,6 +128,33 @@
 				</pluginManagement>
 			</build>
 		</profile>
+		<profile>
+			<id>manifest</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>com.springsource.bundlor</groupId>
+						<artifactId>com.springsource.bundlor.maven</artifactId>
+						<version>${bundlor.version}</version>
+						<executions>
+							<execution>
+								<id>bundlor-manifest</id>
+								<phase>package</phase>
+								<goals>
+									<goal>manifest</goal>
+								</goals>
+								<configuration>
+									<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>mysql</id>
 			<activation>
@@ -179,7 +211,8 @@
 												<![CDATA[</summary>]]>
 											</footer>
 										</concat>
-										<xslt in="target/site/emma-reports/emma-report.xml" out="target/site/emma-reports/index.html" style="src/main/xsl/emma2html.xsl">
+										<xslt in="target/site/emma-reports/emma-report.xml" out="target/site/emma-reports/index.html"
+											style="src/main/xsl/emma2html.xsl">
 											<param name="project" expression="${project.name}" />
 											<param name="version" expression="${project.version}" />
 										</xslt>
@@ -262,7 +295,8 @@
 									</junitreport>
 									<echo>Creating Emma reports</echo>
 									<mkdir dir="target/site/emma-reports" />
-									<xslt includes="target/emma/coverage.xml" destdir="target/emma-reports" style="${project.parent.basedir}/src/main/xsl/emma.xsl">
+									<xslt includes="target/emma/coverage.xml" destdir="target/emma-reports"
+										style="${project.parent.basedir}/src/main/xsl/emma.xsl">
 										<mapper type="glob" from="*.xml" to="*.fragment" />
 										<param name="project" expression="${project.name}" />
 									</xslt>
@@ -302,25 +336,51 @@
 					</dependencies>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<extensions>true</extensions>
+					<groupId>com.springsource.bundlor</groupId>
+					<artifactId>com.springsource.bundlor.maven</artifactId>
+					<version>${bundlor.version}</version>
 					<executions>
 						<execution>
-							<id>manifest</id>
-							<goals>
-								<goal>manifest</goal>
-							</goals>
+							<id>bundlor-transform</id>
+						<!-- This isn't necessary, but Q4E barfs without it. -->
 							<phase>package</phase>
+							<goals>
+								<goal>transform</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>javadoc</id>
+							<phase>package</phase>
+							<goals>
+								<goal>jar</goal>
+							</goals>
 						</execution>
 					</executions>
 					<configuration>
-						<manifestLocation>target/generated-resources/META-INF</manifestLocation>
-						<instructions>
-							<Bundle-SymbolicName>${bundle.symbolic.name}</Bundle-SymbolicName>
-							<Bundle-Version>${pom.version}</Bundle-Version>
-							<Bundle-Name>Spring Batch ${pom.name}</Bundle-Name>
-						</instructions>
+						<links>
+							<link>http://java.sun.com/j2ee/1.4/docs/api</link>
+							<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+							<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+							<link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+							<link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+							<link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+							<link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+							<link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+							<link>http://junit.sourceforge.net/javadoc/</link>
+							<link>http://logging.apache.org/log4j/docs/api/</link>
+							<link>http://jakarta.apache.org/regexp/apidocs/</link>
+							<link>http://jakarta.apache.org/velocity/api/</link>
+							<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+							<link>http://static.springframework.org/spring-batch/apidocs/</link>
+							<link>http://static.springframework.org/spring-ws/site/apidocs/</link>
+						</links>
+						<aggregate>true</aggregate>
+						<excludePackageNames>*.batch.sample,*.batch.container</excludePackageNames>
 					</configuration>
 				</plugin>
 			</plugins>
@@ -378,6 +438,9 @@
 					</filesets>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>
@@ -652,27 +715,6 @@
 				<reportSets>
 					<reportSet>
 						<id>html</id>
-						<configuration>
-							<links>
-								<link>http://java.sun.com/javaee/5/docs/api</link>
-								<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-								<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
-								<link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
-								<link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
-								<link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
-								<link>http://commons.apache.org/logging/commons-logging-1.1.1/apidocs/</link>
-								<link>http://jakarta.apache.org/commons/pool/apidocs/</link>
-								<link>http://www.junit.org/junit/javadoc/</link>
-								<link>http://logging.apache.org/log4j/docs/api/</link>
-								<link>http://jakarta.apache.org/regexp/apidocs/</link>
-								<link>http://jakarta.apache.org/velocity/api/</link>
-								<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
-								<link>http://static.springframework.org/spring-batch/apidocs/</link>
-								<link>http://static.springframework.org/spring-ws/site/apidocs/</link>
-							</links>
-							<aggregate>true</aggregate>
-							<excludePackageNames>*.batch.sample,*.batch.container</excludePackageNames>
-						</configuration>
 						<reports>
 							<report>javadoc</report>
 						</reports>
@@ -731,16 +773,24 @@
 		</repository>
 		<repository>
 			<id>com.springsource.repository.bundles.release</id>
-			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+			<name>SpringSource Enterprise Bundle Repository -
+				SpringSource Bundle Releases</name>
 			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</repository>
 		<repository>
 			<id>com.springsource.repository.bundles.external</id>
-			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+			<name>SpringSource Enterprise Bundle Repository -
+				External Bundle Releases</name>
 			<url>http://repository.springsource.com/maven/bundles/external</url>
 		</repository>
 	</repositories>
 	<pluginRepositories>
+		<pluginRepository>
+			<id>com.springsource.repository.bundles.snapshot</id>
+			<name>SpringSource Enterprise Bundle Repository -
+				SpringSource Bundle Snapshots</name>
+			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
+		</pluginRepository>
 		<pluginRepository>
 			<id>spring-external</id>
 			<name>Spring External Repository</name>
@@ -756,4 +806,4 @@
 			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext</url>
 		</pluginRepository>
 	</pluginRepositories>
-</project>
+</project>
\ No newline at end of file