diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index dc35344ed0..8b9e7e35d9 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -77,8 +77,6 @@ object AkkaBuild extends Build {
     base = file("akka-actor"),
     settings = defaultSettings ++ OSGi.actor ++ Seq(
       autoCompilerPlugins := true,
-      packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), OsgiKeys.bundle).identityMap,
-      artifact in (Compile, packageBin) ~= (_.copy(`type` = "bundle")),
       // to fix scaladoc generation
       fullClasspath in doc in Compile <<= fullClasspath in Compile,
       libraryDependencies ++= Dependencies.actor,
@@ -276,6 +274,13 @@ object AkkaBuild extends Build {
     base = file("akka-sbt-plugin"),
     settings = defaultSettings ++ Seq(
       sbtPlugin := true,
+      publishMavenStyle := false, // SBT Plugins should be published as Ivy
+      publishTo <<= (version) { version: String =>
+        val scalasbt = "http://scalasbt.artifactoryonline.com/scalasbt/"
+        val (name, u) = if (version.contains("-SNAPSHOT")) ("sbt-plugin-snapshots", scalasbt+"sbt-plugin-snapshots")
+        else ("sbt-plugin-releases", scalasbt+"sbt-plugin-releases")
+        Some(Resolver.url(name, url(u))(Resolver.ivyStylePatterns))
+      },
       scalacOptions in Compile := Seq("-encoding", "UTF-8", "-deprecation", "-unchecked"),
       scalaVersion := "2.9.1",
       scalaBinaryVersion <<= scalaVersion