diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 5308166657..a8f6de301b 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -266,7 +266,7 @@ private[akka] class ActorCell(
     subject
   }
 
-  @deprecated("Dog slow and racy")
+  @deprecated("Dog slow and racy", "now")
   def linkedActors: JCollection[ActorRef] = _linkedActors match {
     case Nil  ⇒ JCollections.emptyList[ActorRef]()
     case some ⇒ JCollections.unmodifiableCollection(JavaConverters.asJavaCollectionConverter(some.map(_.child)).asJavaCollection)
diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
index 3e6ea8f2fb..402ba173ec 100644
--- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
@@ -53,7 +53,7 @@ object ActorSerialization {
     replicationScheme: ReplicationScheme): Array[Byte] =
     toBinary(a, srlMailBox, replicationScheme)
 
-  @deprecated("BROKEN, REMOVE ME")
+  @deprecated("BROKEN, REMOVE ME", "NOW")
   private[akka] def toSerializedActorRefProtocol[T <: Actor](
     actorRef: ActorRef,
     serializeMailBox: Boolean,
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 161df203eb..ee6e7e0be0 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -12,7 +12,7 @@ object AkkaBuild extends Build {
   System.setProperty("akka.mode", "test") // Is there better place for this?
 
   lazy val buildSettings = Seq(
-    organization := "se.scalablesolutions.akka",
+    organization := "com.typesafe.akka",
     version      := "2.0-SNAPSHOT",
     scalaVersion := "2.9.1"
   )
@@ -35,7 +35,9 @@ object AkkaBuild extends Build {
     settings = defaultSettings ++ Seq(
       autoCompilerPlugins := true,
       libraryDependencies <+= scalaVersion { v => compilerPlugin("org.scala-lang.plugins" % "continuations" % v) },
-      scalacOptions += "-P:continuations:enable"
+      scalacOptions += "-P:continuations:enable",
+      // to fix scaladoc generation
+      fullClasspath in doc in Compile <<= fullClasspath in Compile
     )
   )
 
diff --git a/project/Publish.scala b/project/Publish.scala
index 38dbdabc8e..1fb9039faa 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -8,10 +8,12 @@ object Publish {
   final val Snapshot = "-SNAPSHOT"
 
   lazy val settings = Seq(
-    crossPaths  := false,
-    pomExtra    := akkaPomExtra,
-    publishTo   := akkaPublishTo,
-    credentials ++= akkaCredentials
+    crossPaths := false,
+    pomExtra := akkaPomExtra,
+    publishTo := akkaPublishTo,
+    credentials ++= akkaCredentials,
+    organizationName := "Typesafe Inc.",
+    organizationHomepage := Some(url("http://www.typesafe.com"))
   )
 
   lazy val versionSettings = Seq(
@@ -21,10 +23,6 @@ object Publish {
   def akkaPomExtra = {
     <inceptionYear>2009</inceptionYear>
     <url>http://akka.io</url>
-    <organization>
-      <name>Typesafe Inc.</name>
-      <url>http://www.typesafe.com</url>
-    </organization>
     <licenses>
       <license>
         <name>Apache 2</name>