diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
index 66d21435f4..594d0ad811 100644
--- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
@@ -37,9 +37,8 @@ class ConfigSpec extends WordSpec with MustMatchers {
       getInt("akka.actor.throughput") must equal(Some(5))
       getInt("akka.actor.throughput-deadline-time") must equal(Some(-1))
 
-      getString("akka.remote.layer") must equal(Some("akka.remote.netty.NettyRemoteSupport"))
-      getString("akka.remote.server.hostname") must equal(Some("localhost"))
-      getInt("akka.remote.server.port") must equal(Some(2552))
+      getString("akka.cluster.layer") must equal(Some("akka.remote.netty.NettyRemoteSupport"))
+      getInt("akka.cluster.server.port") must equal(Some(2552))
     }
   }
 }
diff --git a/akka-docs/modules/spring.rst b/akka-docs/modules/spring.rst
index 29bf4632cf..d8ec97b72c 100644
--- a/akka-docs/modules/spring.rst
+++ b/akka-docs/modules/spring.rst
@@ -323,7 +323,7 @@ The Akka configuration can be made available as property placeholders by using a
   <akka:property-placeholder location="akka.conf"/>
 
   <akka:untyped-actor id="actor-1" implementation="com.biz.MyActor" timeout="${akka.actor.timeout}">
-    <akka:remote host="${akka.remote.server.hostname}" port="${akka.remote.server.port}"/>
+    <akka:remote host="${akka.cluster.server.hostname}" port="${akka.cluster.server.port}"/>
   </akka:untyped-actor>
 
 Camel configuration
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala b/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala
index 0708cffae7..28aea5c12d 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala
@@ -9,59 +9,58 @@ import akka.config.Config._
 import akka.config.ConfigurationException
 
 object RemoteClientSettings {
-  val SECURE_COOKIE: Option[String] = config.getString("akka.remote.secure-cookie", "") match {
+  val SECURE_COOKIE: Option[String] = config.getString("akka.cluster.secure-cookie", "") match {
     case ""     ⇒ None
     case cookie ⇒ Some(cookie)
   }
-  val RECONNECTION_TIME_WINDOW = Duration(config.getInt("akka.remote.client.reconnection-time-window", 600), TIME_UNIT).toMillis
-  val READ_TIMEOUT = Duration(config.getInt("akka.remote.client.read-timeout", 10), TIME_UNIT)
-  val RECONNECT_DELAY = Duration(config.getInt("akka.remote.client.reconnect-delay", 5), TIME_UNIT)
-  val REAP_FUTURES_DELAY = Duration(config.getInt("akka.remote.client.reap-futures-delay", 5), TIME_UNIT)
-  val MESSAGE_FRAME_SIZE = config.getInt("akka.remote.client.message-frame-size", 1048576)
+  val RECONNECTION_TIME_WINDOW = Duration(config.getInt("akka.cluster.client.reconnection-time-window", 600), TIME_UNIT).toMillis
+  val READ_TIMEOUT = Duration(config.getInt("akka.cluster.client.read-timeout", 10), TIME_UNIT)
+  val RECONNECT_DELAY = Duration(config.getInt("akka.cluster.client.reconnect-delay", 5), TIME_UNIT)
+  val REAP_FUTURES_DELAY = Duration(config.getInt("akka.cluster.client.reap-futures-delay", 5), TIME_UNIT)
+  val MESSAGE_FRAME_SIZE = config.getInt("akka.cluster.client.message-frame-size", 1048576)
 }
 
 object RemoteServerSettings {
   val isRemotingEnabled = config.getList("akka.enabled-modules").exists(_ == "remote")
-  val MESSAGE_FRAME_SIZE = config.getInt("akka.remote.server.message-frame-size", 1048576)
-  val SECURE_COOKIE = config.getString("akka.remote.secure-cookie")
+  val MESSAGE_FRAME_SIZE = config.getInt("akka.cluster.server.message-frame-size", 1048576)
+  val SECURE_COOKIE = config.getString("akka.cluster.secure-cookie")
   val REQUIRE_COOKIE = {
-    val requireCookie = config.getBool("akka.remote.server.require-cookie", false)
+    val requireCookie = config.getBool("akka.cluster.server.require-cookie", false)
     if (isRemotingEnabled && requireCookie && SECURE_COOKIE.isEmpty) throw new ConfigurationException(
-      "Configuration option 'akka.remote.server.require-cookie' is turned on but no secure cookie is defined in 'akka.remote.secure-cookie'.")
+      "Configuration option 'akka.cluster.server.require-cookie' is turned on but no secure cookie is defined in 'akka.cluster.secure-cookie'.")
     requireCookie
   }
 
-  val UNTRUSTED_MODE = config.getBool("akka.remote.server.untrusted-mode", false)
-  val HOSTNAME = config.getString("akka.remote.server.hostname", "localhost")
-  val PORT = config.getInt("akka.remote.server.port", 2552)
-  val CONNECTION_TIMEOUT_MILLIS = Duration(config.getInt("akka.remote.server.connection-timeout", 1), TIME_UNIT)
-  val COMPRESSION_SCHEME = config.getString("akka.remote.compression-scheme", "zlib")
+  val UNTRUSTED_MODE = config.getBool("akka.cluster.server.untrusted-mode", false)
+  val PORT = config.getInt("akka.cluster.server.port", 2552)
+  val CONNECTION_TIMEOUT_MILLIS = Duration(config.getInt("akka.cluster.server.connection-timeout", 1), TIME_UNIT)
+  val COMPRESSION_SCHEME = config.getString("akka.cluster.compression-scheme", "zlib")
   val ZLIB_COMPRESSION_LEVEL = {
-    val level = config.getInt("akka.remote.zlib-compression-level", 6)
+    val level = config.getInt("akka.cluster.zlib-compression-level", 6)
     if (level < 1 && level > 9) throw new IllegalArgumentException(
       "zlib compression level has to be within 1-9, with 1 being fastest and 9 being the most compressed")
     level
   }
 
-  val BACKLOG = config.getInt("akka.remote.server.backlog", 4096)
+  val BACKLOG = config.getInt("akka.cluster.server.backlog", 4096)
 
-  val EXECUTION_POOL_KEEPALIVE = Duration(config.getInt("akka.remote.server.execution-pool-keepalive", 60), TIME_UNIT)
+  val EXECUTION_POOL_KEEPALIVE = Duration(config.getInt("akka.cluster.server.execution-pool-keepalive", 60), TIME_UNIT)
 
   val EXECUTION_POOL_SIZE = {
-    val sz = config.getInt("akka.remote.server.execution-pool-size", 16)
-    if (sz < 1) throw new IllegalArgumentException("akka.remote.server.execution-pool-size is less than 1")
+    val sz = config.getInt("akka.cluster.server.execution-pool-size", 16)
+    if (sz < 1) throw new IllegalArgumentException("akka.cluster.server.execution-pool-size is less than 1")
     sz
   }
 
   val MAX_CHANNEL_MEMORY_SIZE = {
-    val sz = config.getInt("akka.remote.server.max-channel-memory-size", 0)
-    if (sz < 0) throw new IllegalArgumentException("akka.remote.server.max-channel-memory-size is less than 0")
+    val sz = config.getInt("akka.cluster.server.max-channel-memory-size", 0)
+    if (sz < 0) throw new IllegalArgumentException("akka.cluster.server.max-channel-memory-size is less than 0")
     sz
   }
 
   val MAX_TOTAL_MEMORY_SIZE = {
-    val sz = config.getInt("akka.remote.server.max-total-memory-size", 0)
-    if (sz < 0) throw new IllegalArgumentException("akka.remote.server.max-total-memory-size is less than 0")
+    val sz = config.getInt("akka.cluster.server.max-total-memory-size", 0)
+    if (sz < 0) throw new IllegalArgumentException("akka.cluster.server.max-total-memory-size is less than 0")
     sz
   }
 }
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 5ffc4b16f3..89bd904c39 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -148,8 +148,8 @@ abstract class RemoteClient private[akka] (
   val module: NettyRemoteClientModule,
   val remoteAddress: InetSocketAddress) {
 
-  val useTransactionLog = config.getBool("akka.remote.client.buffering.retry-message-send-on-failure", true)
-  val transactionLogCapacity = config.getInt("akka.remote.client.buffering.capacity", -1)
+  val useTransactionLog = config.getBool("akka.cluster.client.buffering.retry-message-send-on-failure", true)
+  val transactionLogCapacity = config.getInt("akka.cluster.client.buffering.capacity", -1)
 
   val name = this.getClass.getSimpleName + "@" +
     remoteAddress.getAddress.getHostAddress + "::" +
diff --git a/akka-spring/src/test/resources/property-config.xml b/akka-spring/src/test/resources/property-config.xml
index f199df7074..43d36852ed 100644
--- a/akka-spring/src/test/resources/property-config.xml
+++ b/akka-spring/src/test/resources/property-config.xml
@@ -15,7 +15,7 @@ http://akka.io/akka-2.0-SNAPSHOT.xsd">
   <akka:untyped-actor id="actor-1"
                       implementation="akka.spring.foo.PingActor"
                       timeout="${akka.actor.timeout}">
-    <akka:remote host="${akka.remote.server.hostname}" port="${akka.remote.server.port}"/>
+    <akka:remote host="${akka.cluster.server.hostname}" port="${akka.cluster.server.port}"/>
   </akka:untyped-actor>
 
 
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 6eb218bc06..2d3a1f46f0 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -156,6 +156,15 @@ akka {
                                          #     cluster reference to the actor
                                          #     Default: on
 
+    # secure-cookie = "050E0A0D0D06010A00000900040D060F0C09060B" # generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' or using 'Crypt.generateSecureCookie'
+    secure-cookie = ""
+
+    compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression
+    zlib-compression-level = 6  # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
+
+    # FIXME rename to transport
+    layer = "akka.remote.netty.NettyRemoteSupport"
+
     replication {
       digest-type = "MAC"                # Options: CRC32 (cheap & unsafe), MAC (expensive & secure using password)
       password = "secret"                # FIXME: store open in file?
@@ -164,22 +173,9 @@ akka {
       snapshot-frequency = 1000          # The number of messages that should be logged between every actor snapshot
       timeout = 30                       # Timeout for asyncronous (write-behind) operations
     }
-  }
-
-  remote {
-
-    # secure-cookie = "050E0A0D0D06010A00000900040D060F0C09060B" # generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' or using 'Crypt.generateSecureCookie'
-    secure-cookie = ""
-
-    compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression
-    zlib-compression-level = 6  # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
-
-    layer = "akka.remote.netty.NettyRemoteSupport"
 
     server {
-      # FIXME remove hostname/port
-      hostname = "localhost"        # The hostname or IP that clients should connect to
-      port = 2552                   # The port clients should connect to. Default is 2552 (AKKA)
+      port = 2552                   # The default remote server port clients should connect to. Default is 2552 (AKKA)
       message-frame-size = 1048576  # Increase this if you want to be able to send messages with large payloads
       connection-timeout = 1
       require-cookie = off          # Should the remote server require that it peers share the same secure-cookie (defined in the 'remote' section)?