diff --git a/akka-docs/additional/code/osgi/blueprint.xml b/akka-docs/additional/code/osgi/blueprint.xml
index f817da85b0..8fcedb990c 100644
--- a/akka-docs/additional/code/osgi/blueprint.xml
+++ b/akka-docs/additional/code/osgi/blueprint.xml
@@ -2,9 +2,13 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:akka="http://akka.io/xmlns/blueprint/v1.0.0">
 
-    <akka:actor-system name="BlueprintSystem">
-        <akka:actor class="org.apache.servicemix.examples.akka.Listener"/>
-        <akka:actor class="org.apache.servicemix.examples.akka.Master"/>
-    </akka:actor-system>
+    <akka:actor-system name="BlueprintSystem" />
 
+    <akka:actor-system name="BlueprintSystemWithConfig">
+        <akka:config>
+            some.config {
+              key=value
+            }
+        </akka:config>
+    </akka:actor-system>
 </blueprint>
diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
index ef04607976..7f60aebccc 100644
--- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
@@ -9,10 +9,10 @@ import java.util.Properties
  * Abstract {@link BundleActivator} implementation to bootstrap and configure an {@link ActorSystem} in an
  * OSGi environment.
  */
-abstract class ActorSystemActivator(nameFor: (BundleContext) ⇒ String) extends BundleActivator {
+abstract class ActorSystemActivator(nameFor: (BundleContext) ⇒ Option[String]) extends BundleActivator {
 
-  def this() = this({ context: BundleContext ⇒ null })
-  def this(name: String) = this({ context: BundleContext ⇒ name })
+  def this() = this({ context: BundleContext ⇒ None })
+  def this(name: String) = this({ context: BundleContext ⇒ Some(name) })
 
   var system: ActorSystem = null