diff --git a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
index eaf5fbab79..49d0a631f6 100644
--- a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
@@ -7,6 +7,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.typesafe.config.ConfigFactory;
+
 //#import
 import akka.actor.ActorRef;
 import akka.actor.Address;
@@ -60,6 +62,14 @@ public class RemoteDeploymentDocTestBase {
     actor.tell("Pretty slick", null);
     //#sample-actor
   }
+  
+  @Test
+  public void demonstrateProgrammaticConfig() {
+    //#programmatic
+    ConfigFactory.parseString("akka.remote.netty.hostname=\"1.2.3.4\"")
+        .withFallback(ConfigFactory.load());
+    //#programmatic
+  }
 
   
 }
\ No newline at end of file
diff --git a/akka-docs/rst/java/remoting.rst b/akka-docs/rst/java/remoting.rst
index 826a5b7ba1..efd4b0e43f 100644
--- a/akka-docs/rst/java/remoting.rst
+++ b/akka-docs/rst/java/remoting.rst
@@ -60,6 +60,13 @@ reference file for more information:
 .. literalinclude:: ../../../akka-remote/src/main/resources/reference.conf
    :language: none
 
+.. note::
+
+   Setting properties like the listening IP and port number programmatically is
+   best done by using something like the following:
+
+   .. includecode:: code/docs/remoting/RemoteDeploymentDocTestBase.java#programmatic
+
 Looking up Remote Actors
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/akka-docs/rst/scala/remoting.rst b/akka-docs/rst/scala/remoting.rst
index ca7220a419..c866e9c1e6 100644
--- a/akka-docs/rst/scala/remoting.rst
+++ b/akka-docs/rst/scala/remoting.rst
@@ -57,6 +57,13 @@ reference file for more information:
 .. literalinclude:: ../../../akka-remote/src/main/resources/reference.conf
    :language: none
 
+.. note::
+
+   Setting properties like the listening IP and port number programmatically is
+   best done by using something like the following:
+
+   .. includecode:: ../java/code/docs/remoting/RemoteDeploymentDocTestBase.java#programmatic
+
 Types of Remote Interaction
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^