Index: runtime-osgi/pom.xml
===================================================================
--- runtime-osgi/pom.xml	(revision 9428)
+++ runtime-osgi/pom.xml	(working copy)
@@ -27,6 +27,23 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>process-classes</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="target/services/META-INF/services"/>
+								<ant antfile="../build.xml" target="create-service-files" dir="${basedir}" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>   
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -34,19 +51,20 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+						<Bundle-SymbolicName>org.openrdf.sesame2</Bundle-SymbolicName>
 						<Export-Package>!*text-base,!*prop-base,org.openrdf.*,info.aduna.*</Export-Package>
 						<Import-Package>
 							org.slf4j.*, 
+							info.aduna.*;version=0,
 							javax.*;resolution:=optional, 
 							org.apache.*;resolution:=optional,
 							org.springframework.*;resolution:=optional,
 							*
 						</Import-Package>
-						<!-- this gem comes from a splendid post of Stuart McCullough - felix developer -->
-						<!-- posted on the felix-users mailing list -->
-						<!-- http://www.nabble.com/forum/ViewPost.jtp?post=23404902&framed=y -->
-						<Embed-Transitive>true</Embed-Transitive>
-						<Embed-Dependency>*;scope=compile|runtime;groupId=org.openrdf.sesame;inline=META-INF/services/*</Embed-Dependency>
+						<Include-Resource>
+							{maven-resources},
+							META-INF/services=target/services/META-INF/services
+						</Include-Resource>
 					</instructions>
 				</configuration>
 			</plugin>
Index: build.xml
===================================================================
--- build.xml	(revision 9428)
+++ build.xml	(working copy)
@@ -46,10 +46,8 @@
 			<arg line="-N clean site" />
 		</exec>
 	</target>
-
-	<target name="override-onejar-services">
-		<xmlproperty file="pom.xml" />
-
+	
+	<target name="create-service-files">
 		<antcall target="concat-service-file">
 			<param name="service" value="org.openrdf.query.algebra.evaluation.function.Function"/>
 		</antcall>
@@ -80,17 +78,21 @@
 		<antcall target="concat-service-file">
 			<param name="service" value="org.openrdf.sail.config.SailFactory"/>
 		</antcall>
+	</target>
 
+	<target name="override-onejar-services" depends="create-service-files">
+		<xmlproperty file="pom.xml" />
 		<zip destfile="target/openrdf-sesame-${project.version}-onejar.jar" update="true">
 			<fileset dir="target/services"/>
 		</zip>
 	</target>
 
 	<target name="concat-service-file">
+		<dirname property="antfile.dir" file="${ant.file}"/>
 		<echo message="META-INF/services/${service}"/>
 
 		<concat destfile="target/services/META-INF/services/${service}" fixlastline="yes">
-			<fileset dir="." includes="**/src/main/resources/META-INF/services/${service}"/>
+			<fileset dir="${antfile.dir}" includes="**/src/main/resources/META-INF/services/${service}"/>
 		</concat>
 	</target>