diff --git a/akka-docs/rst/java/untyped-actors.rst b/akka-docs/rst/java/untyped-actors.rst
index f10fc30787..2acc8bbee1 100644
--- a/akka-docs/rst/java/untyped-actors.rst
+++ b/akka-docs/rst/java/untyped-actors.rst
@@ -127,10 +127,11 @@ UntypedActor API
 The :class:`UntypedActor` class defines only one abstract method, the above mentioned
 :meth:`onReceive(Object message)`, which implements the behavior of the actor.
 
-If the current actor behavior does not match a received message,
-:meth:`unhandled` is called, which by default publishes a ``new
+If the current actor behavior does not match a received message, it's recommended that
+you call the :meth:`unhandled` method, which by default publishes a ``new
 akka.actor.UnhandledMessage(message, sender, recipient)`` on the actor system’s
-event stream.
+event stream (set configuration item ``akka.actor.debug.unhandled`` to ``on`` 
+to have them converted into actual Debug messages).
 
 In addition, it offers:
 
diff --git a/akka-docs/rst/scala/actors.rst b/akka-docs/rst/scala/actors.rst
index e52d9ba973..4f44497485 100644
--- a/akka-docs/rst/scala/actors.rst
+++ b/akka-docs/rst/scala/actors.rst
@@ -234,8 +234,8 @@ If the current actor behavior does not match a received message,
 :meth:`unhandled` is called, which by default publishes an
 ``akka.actor.UnhandledMessage(message, sender, recipient)`` on the actor
 system’s event stream (set configuration item
-``akka.event-handler-startup-timeout`` to ``true`` to have them converted into
-actual Debug messages)
+``akka.actor.debug.unhandled`` to ``on`` to have them converted into
+actual Debug messages).
 
 In addition, it offers: