diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
index bb0634876e..03d9982bd1 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
@@ -15,7 +15,7 @@ import akka.cluster.routing.ClusterRouterConfig
 import akka.event.EventStream
 import akka.remote.RemoteActorRefProvider
 import akka.remote.RemoteDeployer
-import akka.routing.RemoteRouterConfig
+import akka.remote.routing.RemoteRouterConfig
 import akka.cluster.routing.ClusterRouterSettings
 
 class ClusterActorRefProvider(
diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
index 89622867af..9c6bb9cfa9 100644
--- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
@@ -28,7 +28,7 @@ import akka.routing.Route
 import akka.routing.RouteeProvider
 import akka.routing.Router
 import akka.routing.RouterConfig
-import akka.routing.RemoteRouterConfig
+import akka.remote.routing.RemoteRouterConfig
 import akka.actor.RootActorPath
 import akka.actor.ActorCell
 import akka.actor.RelativeActorPath
diff --git a/akka-docs/java/code/docs/jrouting/RouterViaProgramExample.java b/akka-docs/java/code/docs/jrouting/RouterViaProgramExample.java
index 72843b44c6..99b924d09b 100644
--- a/akka-docs/java/code/docs/jrouting/RouterViaProgramExample.java
+++ b/akka-docs/java/code/docs/jrouting/RouterViaProgramExample.java
@@ -5,7 +5,7 @@ package docs.jrouting;
 
 import akka.routing.RoundRobinRouter;
 import akka.routing.DefaultResizer;
-import akka.routing.RemoteRouterConfig;
+import akka.remote.routing.RemoteRouterConfig;
 import akka.actor.ActorRef;
 import akka.actor.Props;
 import akka.actor.UntypedActor;
diff --git a/akka-docs/project/migration-guide-2.0.x-2.1.x.rst b/akka-docs/project/migration-guide-2.0.x-2.1.x.rst
index fd5629ea3b..54e9f2df5e 100644
--- a/akka-docs/project/migration-guide-2.0.x-2.1.x.rst
+++ b/akka-docs/project/migration-guide-2.0.x-2.1.x.rst
@@ -6,7 +6,8 @@
 
 The 2.1 release contains several structural changes that require some
 simple, mechanical source-level changes in client code. Several things have
-been moved to Scala standard library, such as ``Future``.
+been moved to Scala standard library, such as ``Future``, and some package
+names have been changed in Remoting.
 
 When migrating from 1.3.x to 2.1.x you should first follow the instructions for
 migrating `1.3.x to 2.0.x <http://doc.akka.io/docs/akka/2.0.3/project/migration-guide-1.3.x-2.0.x.html>`_.
@@ -358,4 +359,18 @@ v2.1::
     else if (requestedCapacity < 0) routeeProvider.removeRoutees(
       -requestedCapacity, stopDelay)
 
+Package Name Changes in Remoting
+================================
 
+The package name of all classes in the ``akka-remote.jar`` artifact now starts with akka.remote.
+This has been done to enable OSGi bundles that don't have conflicting package names.
+
+Change the following import statements. Please note that the serializers are often referenced from configuration.
+
+================================================ =======================================================
+Search                                           Replace with
+================================================ =======================================================
+``akka.routing.RemoteRouterConfig``              ``akka.remote.routing.RemoteRouterConfig``
+``akka.serialization.ProtobufSerializer``        ``akka.remote.serialization.ProtobufSerializer``
+``akka.serialization.DaemonMsgCreateSerializer`` ``akka.remote.serialization.DaemonMsgCreateSerializer``
+================================================ =======================================================
diff --git a/akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala b/akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala
index 79219b742b..6269e7f698 100644
--- a/akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala
+++ b/akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala
@@ -6,7 +6,7 @@ package docs.routing
 import akka.routing.RoundRobinRouter
 import akka.actor.{ ActorRef, Props, Actor, ActorSystem }
 import akka.routing.DefaultResizer
-import akka.routing.RemoteRouterConfig
+import akka.remote.routing.RemoteRouterConfig
 
 case class Message1(nbr: Int)
 
diff --git a/akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala b/akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala
index 9b222436da..d979952887 100644
--- a/akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala
+++ b/akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala
@@ -104,7 +104,7 @@ package docs.serialization {
         actor {
           serializers {
             java = "akka.serialization.JavaSerializer"
-            proto = "akka.serialization.ProtobufSerializer"
+            proto = "akka.remote.serialization.ProtobufSerializer"
             myown = "docs.serialization.MyOwnSerializer"
           }
         }
@@ -122,7 +122,7 @@ package docs.serialization {
         actor {
           serializers {
             java = "akka.serialization.JavaSerializer"
-            proto = "akka.serialization.ProtobufSerializer"
+            proto = "akka.remote.serialization.ProtobufSerializer"
             myown = "docs.serialization.MyOwnSerializer"
           }
 
diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index 66f6b660ba..4af8f4478f 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -13,8 +13,8 @@ akka {
   actor {
 
     serializers {
-      proto = "akka.serialization.ProtobufSerializer"
-      daemon-create = "akka.serialization.DaemonMsgCreateSerializer"
+      proto = "akka.remote.serialization.ProtobufSerializer"
+      daemon-create = "akka.remote.serialization.DaemonMsgCreateSerializer"
     }
 
 
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala
index 16c65986ee..fbc9c7b913 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala
@@ -5,6 +5,7 @@ package akka.remote
 
 import akka.actor._
 import akka.routing._
+import akka.remote.routing._
 import com.typesafe.config._
 import akka.ConfigurationException
 
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
index 83fdb781a7..bc4f39dca4 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
@@ -9,7 +9,7 @@ import javax.net.ssl.{ KeyManagerFactory, TrustManager, TrustManagerFactory, SSL
 import akka.remote.RemoteTransportException
 import akka.event.LoggingAdapter
 import java.io.{ IOException, FileNotFoundException, FileInputStream }
-import akka.security.provider.AkkaProvider
+import akka.remote.security.provider.AkkaProvider
 import java.security._
 
 /**
diff --git a/akka-remote/src/main/scala/akka/routing/RemoteRouterConfig.scala b/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala
similarity index 97%
rename from akka-remote/src/main/scala/akka/routing/RemoteRouterConfig.scala
rename to akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala
index 7075aa5ea7..c22ff7dfa8 100644
--- a/akka-remote/src/main/scala/akka/routing/RemoteRouterConfig.scala
+++ b/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala
@@ -1,8 +1,9 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.routing
+package akka.remote.routing
 
+import akka.routing.{ Route, Router, RouterConfig, RouteeProvider, Resizer }
 import com.typesafe.config.ConfigFactory
 import akka.actor.ActorContext
 import akka.actor.ActorRef
diff --git a/akka-remote/src/main/scala/akka/security/provider/AES128CounterInetRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterInetRNG.scala
similarity index 97%
rename from akka-remote/src/main/scala/akka/security/provider/AES128CounterInetRNG.scala
rename to akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterInetRNG.scala
index 9944f3d6d4..7019b4b1a3 100644
--- a/akka-remote/src/main/scala/akka/security/provider/AES128CounterInetRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterInetRNG.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.security.provider
+package akka.remote.security.provider
 
 import org.uncommons.maths.random.{ AESCounterRNG }
 import SeedSize.Seed128
diff --git a/akka-remote/src/main/scala/akka/security/provider/AES128CounterSecureRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterSecureRNG.scala
similarity index 97%
rename from akka-remote/src/main/scala/akka/security/provider/AES128CounterSecureRNG.scala
rename to akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterSecureRNG.scala
index bd422a249b..acf936d46e 100644
--- a/akka-remote/src/main/scala/akka/security/provider/AES128CounterSecureRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterSecureRNG.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.security.provider
+package akka.remote.security.provider
 
 import org.uncommons.maths.random.{ AESCounterRNG, SecureRandomSeedGenerator }
 import SeedSize.Seed128
diff --git a/akka-remote/src/main/scala/akka/security/provider/AES256CounterInetRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterInetRNG.scala
similarity index 97%
rename from akka-remote/src/main/scala/akka/security/provider/AES256CounterInetRNG.scala
rename to akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterInetRNG.scala
index 4c7de74990..edd6b3cab5 100644
--- a/akka-remote/src/main/scala/akka/security/provider/AES256CounterInetRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterInetRNG.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.security.provider
+package akka.remote.security.provider
 
 import org.uncommons.maths.random.{ AESCounterRNG }
 import SeedSize.Seed256
diff --git a/akka-remote/src/main/scala/akka/security/provider/AES256CounterSecureRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterSecureRNG.scala
similarity index 97%
rename from akka-remote/src/main/scala/akka/security/provider/AES256CounterSecureRNG.scala
rename to akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterSecureRNG.scala
index 8650cd75c4..aadb2131e3 100644
--- a/akka-remote/src/main/scala/akka/security/provider/AES256CounterSecureRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterSecureRNG.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.security.provider
+package akka.remote.security.provider
 
 import org.uncommons.maths.random.{ AESCounterRNG, SecureRandomSeedGenerator }
 import SeedSize.Seed256
diff --git a/akka-remote/src/main/scala/akka/security/provider/AkkaProvider.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala
similarity index 97%
rename from akka-remote/src/main/scala/akka/security/provider/AkkaProvider.scala
rename to akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala
index 8cbebe4190..ed32cd04d8 100644
--- a/akka-remote/src/main/scala/akka/security/provider/AkkaProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.security.provider
+package akka.remote.security.provider
 
 import java.security.{ PrivilegedAction, AccessController, Provider, Security }
 
diff --git a/akka-remote/src/main/scala/akka/security/provider/InternetSeedGenerator.scala b/akka-remote/src/main/scala/akka/remote/security/provider/InternetSeedGenerator.scala
similarity index 98%
rename from akka-remote/src/main/scala/akka/security/provider/InternetSeedGenerator.scala
rename to akka-remote/src/main/scala/akka/remote/security/provider/InternetSeedGenerator.scala
index e28cbf4f17..f049a4e678 100644
--- a/akka-remote/src/main/scala/akka/security/provider/InternetSeedGenerator.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/InternetSeedGenerator.scala
@@ -13,7 +13,7 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 // ============================================================================
-package akka.security.provider
+package akka.remote.security.provider
 
 import org.uncommons.maths.random.{ SeedGenerator, SeedException, SecureRandomSeedGenerator, RandomDotOrgSeedGenerator, DevRandomSeedGenerator }
 
diff --git a/akka-remote/src/main/scala/akka/security/provider/SeedSize.scala b/akka-remote/src/main/scala/akka/remote/security/provider/SeedSize.scala
similarity index 91%
rename from akka-remote/src/main/scala/akka/security/provider/SeedSize.scala
rename to akka-remote/src/main/scala/akka/remote/security/provider/SeedSize.scala
index c8c7c0e661..a659c924bf 100644
--- a/akka-remote/src/main/scala/akka/security/provider/SeedSize.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/SeedSize.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.security.provider
+package akka.remote.security.provider
 
 /**
  * Internal API
diff --git a/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala
similarity index 98%
rename from akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala
rename to akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala
index 19aabd398f..caa0e2d9af 100644
--- a/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala
+++ b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala
@@ -2,8 +2,9 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.serialization
+package akka.remote.serialization
 
+import akka.serialization.{ Serializer, SerializationExtension }
 import java.io.Serializable
 import com.google.protobuf.ByteString
 import com.typesafe.config.{ Config, ConfigFactory }
diff --git a/akka-remote/src/main/scala/akka/serialization/ProtobufSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala
similarity index 95%
rename from akka-remote/src/main/scala/akka/serialization/ProtobufSerializer.scala
rename to akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala
index 77f6702a77..26bf6621ac 100644
--- a/akka-remote/src/main/scala/akka/serialization/ProtobufSerializer.scala
+++ b/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala
@@ -2,8 +2,9 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.serialization
+package akka.remote.serialization
 
+import akka.serialization.{ Serializer, Serialization }
 import com.google.protobuf.Message
 import akka.actor.DynamicAccess
 import akka.remote.RemoteProtocol.ActorRefProtocol
diff --git a/akka-remote/src/test/java/akka/actor/ProtobufProtocol.java b/akka-remote/src/test/java/akka/remote/ProtobufProtocol.java
similarity index 86%
rename from akka-remote/src/test/java/akka/actor/ProtobufProtocol.java
rename to akka-remote/src/test/java/akka/remote/ProtobufProtocol.java
index f29c9efee3..1b7f13a1da 100644
--- a/akka-remote/src/test/java/akka/actor/ProtobufProtocol.java
+++ b/akka-remote/src/test/java/akka/remote/ProtobufProtocol.java
@@ -1,7 +1,9 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ProtobufProtocol.proto
 
-package akka.actor;
+package akka.remote;
+
+import com.google.protobuf.AbstractMessage;
 
 public final class ProtobufProtocol {
   private ProtobufProtocol() {}
@@ -43,12 +45,12 @@ public final class ProtobufProtocol {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return akka.actor.ProtobufProtocol.internal_static_akka_actor_MyMessage_descriptor;
+      return ProtobufProtocol.internal_static_akka_actor_MyMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return akka.actor.ProtobufProtocol.internal_static_akka_actor_MyMessage_fieldAccessorTable;
+      return ProtobufProtocol.internal_static_akka_actor_MyMessage_fieldAccessorTable;
     }
 
     private int bitField0_;
@@ -175,41 +177,41 @@ public final class ProtobufProtocol {
       return super.writeReplace();
     }
 
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(
+    public static ProtobufProtocol.MyMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(
+    public static ProtobufProtocol.MyMessage parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(byte[] data)
+    public static ProtobufProtocol.MyMessage parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(
+    public static ProtobufProtocol.MyMessage parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(java.io.InputStream input)
+    public static ProtobufProtocol.MyMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(
+    public static ProtobufProtocol.MyMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseDelimitedFrom(java.io.InputStream input)
+    public static ProtobufProtocol.MyMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -218,7 +220,7 @@ public final class ProtobufProtocol {
         return null;
       }
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseDelimitedFrom(
+    public static ProtobufProtocol.MyMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -229,12 +231,12 @@ public final class ProtobufProtocol {
         return null;
       }
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(
+    public static ProtobufProtocol.MyMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static akka.actor.ProtobufProtocol.MyMessage parseFrom(
+    public static ProtobufProtocol.MyMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -244,7 +246,7 @@ public final class ProtobufProtocol {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.actor.ProtobufProtocol.MyMessage prototype) {
+    public static Builder newBuilder(ProtobufProtocol.MyMessage prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -257,15 +259,15 @@ public final class ProtobufProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.actor.ProtobufProtocol.MyMessageOrBuilder {
+       implements ProtobufProtocol.MyMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return akka.actor.ProtobufProtocol.internal_static_akka_actor_MyMessage_descriptor;
+        return ProtobufProtocol.internal_static_akka_actor_MyMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return akka.actor.ProtobufProtocol.internal_static_akka_actor_MyMessage_fieldAccessorTable;
+        return ProtobufProtocol.internal_static_akka_actor_MyMessage_fieldAccessorTable;
       }
 
       // Construct using akka.actor.ProtobufProtocol.MyMessage.newBuilder()
@@ -302,33 +304,33 @@ public final class ProtobufProtocol {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return akka.actor.ProtobufProtocol.MyMessage.getDescriptor();
+        return ProtobufProtocol.MyMessage.getDescriptor();
       }
 
-      public akka.actor.ProtobufProtocol.MyMessage getDefaultInstanceForType() {
-        return akka.actor.ProtobufProtocol.MyMessage.getDefaultInstance();
+      public ProtobufProtocol.MyMessage getDefaultInstanceForType() {
+        return ProtobufProtocol.MyMessage.getDefaultInstance();
       }
 
-      public akka.actor.ProtobufProtocol.MyMessage build() {
-        akka.actor.ProtobufProtocol.MyMessage result = buildPartial();
+      public ProtobufProtocol.MyMessage build() {
+        ProtobufProtocol.MyMessage result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+          throw AbstractMessage.Builder.newUninitializedMessageException(result);
         }
         return result;
       }
 
-      private akka.actor.ProtobufProtocol.MyMessage buildParsed()
+      private ProtobufProtocol.MyMessage buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.actor.ProtobufProtocol.MyMessage result = buildPartial();
+        ProtobufProtocol.MyMessage result = buildPartial();
         if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
+          throw AbstractMessage.Builder.newUninitializedMessageException(
+                  result).asInvalidProtocolBufferException();
         }
         return result;
       }
 
-      public akka.actor.ProtobufProtocol.MyMessage buildPartial() {
-        akka.actor.ProtobufProtocol.MyMessage result = new akka.actor.ProtobufProtocol.MyMessage(this);
+      public ProtobufProtocol.MyMessage buildPartial() {
+        ProtobufProtocol.MyMessage result = new ProtobufProtocol.MyMessage(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -349,16 +351,16 @@ public final class ProtobufProtocol {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.actor.ProtobufProtocol.MyMessage) {
-          return mergeFrom((akka.actor.ProtobufProtocol.MyMessage)other);
+        if (other instanceof ProtobufProtocol.MyMessage) {
+          return mergeFrom((ProtobufProtocol.MyMessage)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(akka.actor.ProtobufProtocol.MyMessage other) {
-        if (other == akka.actor.ProtobufProtocol.MyMessage.getDefaultInstance()) return this;
+      public Builder mergeFrom(ProtobufProtocol.MyMessage other) {
+        if (other == ProtobufProtocol.MyMessage.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -550,8 +552,8 @@ public final class ProtobufProtocol {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_akka_actor_MyMessage_descriptor,
               new java.lang.String[] { "Id", "Name", "Status", },
-              akka.actor.ProtobufProtocol.MyMessage.class,
-              akka.actor.ProtobufProtocol.MyMessage.Builder.class);
+              ProtobufProtocol.MyMessage.class,
+              ProtobufProtocol.MyMessage.Builder.class);
           return null;
         }
       };
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
index 2c44ece031..ab7fb23356 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
@@ -6,6 +6,7 @@ package akka.remote
 import akka.testkit._
 import akka.routing._
 import akka.actor._
+import akka.remote.routing._
 import com.typesafe.config._
 
 object RemoteRouterSpec {
diff --git a/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.scala
similarity index 97%
rename from akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
rename to akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.scala
index 38a50ea886..2c80c99615 100644
--- a/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.scala
@@ -2,10 +2,11 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.serialization
+package akka.remote.serialization
 
 import language.postfixOps
 
+import akka.serialization.SerializationExtension
 import com.typesafe.config.ConfigFactory
 import akka.testkit.AkkaSpec
 import akka.actor.{ Actor, Address, Props, Deploy, OneForOneStrategy, SupervisorStrategy, FromClassCreator }
diff --git a/akka-remote/src/test/scala/akka/serialization/ProtobufSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala
similarity index 81%
rename from akka-remote/src/test/scala/akka/serialization/ProtobufSerializerSpec.scala
rename to akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala
index 474ef485d7..f9fac112bd 100644
--- a/akka-remote/src/test/scala/akka/serialization/ProtobufSerializerSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.serialization
+package akka.remote.serialization
 
+import akka.serialization.SerializationExtension
 import akka.testkit.AkkaSpec
 import akka.remote.RemoteProtocol.MessageProtocol
-import akka.actor.ProtobufProtocol.MyMessage
+import akka.remote.ProtobufProtocol.MyMessage
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class ProtobufSerializerSpec extends AkkaSpec {
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 3ea8a96177..2c0488f453 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -522,7 +522,7 @@ object AkkaBuild extends Build {
 
     val osgiAries = exports() ++ Seq(OsgiKeys.privatePackage := Seq("akka.osgi.aries.*"))
 
-    val remote = exports(Seq("akka.remote.*", "akka.routing.*", "akka.serialization.*"))
+    val remote = exports(Seq("akka.remote.*"))
 
     val slf4j = exports(Seq("akka.event.slf4j.*"))
 
@@ -532,9 +532,7 @@ object AkkaBuild extends Build {
 
     val zeroMQ = exports(Seq("akka.zeromq.*"))
 
-    def exports(packages: Seq[String] = Seq()) = Seq.empty
-
-    def exportsReal(packages: Seq[String] = Seq()) = osgiSettings ++ Seq(
+    def exports(packages: Seq[String] = Seq()) = osgiSettings ++ Seq(
       OsgiKeys.importPackage := defaultImports,
       OsgiKeys.exportPackage := packages
     )