diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index d4f563f1d5..31bd9e9245 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -21,7 +21,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
   val CASSANDRA_VERSION = "0.6.1"
   val LIFT_VERSION = "2.0-scala280-SNAPSHOT"
   val SCALATEST_VERSION = "1.2-for-scala-2.8.0.RC3-SNAPSHOT"
-  val MULTIVERSE_VERSION = "0.5.2"
   val COMMONS_CODEC_VERSION = "1.4"
   val MULTIVERSE_VERSION = "0.6-SNAPSHOT"
 
@@ -69,12 +68,9 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
   val grizzlyModuleConfig     = ModuleConfiguration("com.sun.grizzly", javaNetRepo)
  // val atmosphereModuleConfig  = ModuleConfiguration("org.atmosphere", sonatypeSnapshotRepo)
   val liftModuleConfig        = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots)
-<<<<<<< HEAD
-  val scalaBundleConfig       = ModuleConfiguration("com.weiglewilczek.scala-lang-osgi", ScalaToolsReleases)
-=======
+//  val scalaBundleConfig       = ModuleConfiguration("com.weiglewilczek.scala-lang-osgi", ScalaToolsReleases)
   def codehausSnapshotRepo    = "Codehaus Snapshots" at "http://snapshots.repository.codehaus.org"
   val multiverseModuleConfig  = ModuleConfiguration("org.multiverse", codehausSnapshotRepo)
->>>>>>> master
 
   // ------------------------------------------------------------
   // project defintions
@@ -528,8 +524,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
 
   trait OSGiProject extends DefaultProject with BNDPlugin {
     override def artifactID = moduleID + "_osgi"
-    override def bndExportPackage = Seq("se.scalablesolutions.akka.*;version=0.9")    
-
+    override def bndExportPackage = Seq("se.scalablesolutions.akka.*;version=%s".format(projectVersion.value))
   }
-
 }
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index bee2aec2f2..1efcad620c 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -6,5 +6,5 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
 //  val repo = "GH-pages repo" at "http://mpeltonen.github.com/maven/"
 //  val idea = "com.github.mpeltonen" % "sbt-idea-plugin" % "0.1-SNAPSHOT"
 
-  val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC2"  
+  val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC3"
 }