diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 9dada5fbad..b5a298e8ff 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -526,32 +526,32 @@ object Dependency {
   def v(a: String): String = a+"_"+AkkaBuild.desiredScalaVersion
 
   // Compile
-  val config        = "com.typesafe"                % "config"                     % "0.4.1"       // ApacheV2
-  val camelCore     = "org.apache.camel"            % "camel-core"                 % "2.8.0"       // ApacheV2
-  val netty         = "io.netty"                    % "netty"                      % "3.5.1.Final" // ApacheV2
-  val protobuf      = "com.google.protobuf"         % "protobuf-java"              % "2.4.1"       // New BSD
-  val scalaStm      = "org.scala-tools"             % v("scala-stm")               % "0.5"         // Modified BSD (Scala)
-  val slf4jApi      = "org.slf4j"                   % "slf4j-api"                  % "1.6.4"       // MIT
-  val zeroMQ        = "org.zeromq"                  % v("zeromq-scala-binding")    % "0.0.6"       // ApacheV2  //FIXME SWITCH TO OFFICIAL VERSION
-  val uncommonsMath = "org.uncommons.maths"         % "uncommons-maths"            % "1.2.2a"      // ApacheV2
-  val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint" % "0.3.2"       // ApacheV2
-  val osgiCore      = "org.osgi"                    % "org.osgi.core"              % "4.2.0"       // ApacheV2
+  val config        = "com.typesafe"                % "config"                       % "0.4.1"       // ApacheV2
+  val camelCore     = "org.apache.camel"            % "camel-core"                   % "2.8.0"       // ApacheV2
+  val netty         = "io.netty"                    % "netty"                        % "3.5.1.Final" // ApacheV2
+  val protobuf      = "com.google.protobuf"         % "protobuf-java"                % "2.4.1"       // New BSD
+  val scalaStm      = "org.scala-tools"             % v("scala-stm")                 % "0.5"         // Modified BSD (Scala)
+  val slf4jApi      = "org.slf4j"                   % "slf4j-api"                    % "1.6.4"       // MIT
+  val zeroMQ        = "org.zeromq"                  % v("zeromq-scala-binding")      % "0.0.6"       // ApacheV2
+  val uncommonsMath = "org.uncommons.maths"         % "uncommons-maths"              % "1.2.2a"      // ApacheV2
+  val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint"   % "0.3.2"       // ApacheV2
+  val osgiCore      = "org.osgi"                    % "org.osgi.core"                % "4.2.0"       // ApacheV2
 
   // Test
 
   object Test {
-    val commonsMath = "org.apache.commons"          % "commons-math"            % "2.1"               % "test" // ApacheV2
-    val commonsIo   = "commons-io"                  % "commons-io"              % "2.0.1"             % "test" // ApacheV2
-    val junit       = "junit"                       % "junit"                   % "4.10"              % "test" // Common Public License 1.0
-    val logback     = "ch.qos.logback"              % "logback-classic"         % "1.0.4"             % "test" // EPL 1.0 / LGPL 2.1
-    val mockito     = "org.mockito"                 % "mockito-all"             % "1.8.1"             % "test" // MIT
-    val scalatest   = "org.scalatest"               % v("scalatest")            % "1.9-2.10.0-M5-B2"  % "test" // ApacheV2
-    val scalacheck  = "org.scalacheck"              % v("scalacheck")           % "1.10.0"            % "test" // New BSD
-    val ariesProxy  = "org.apache.aries.proxy"      % "org.apache.aries.proxy.impl"  % "0.3" % "test"  // ApacheV2
-    val pojosr      = "com.googlecode.pojosr"       % "de.kalpatec.pojosr.framework" % "0.1.4"   % "test" // ApacheV2
-    val tinybundles = "org.ops4j.pax.tinybundles"   % "tinybundles"         % "1.0.0"      % "test" // ApacheV2
-    val log4j       = "log4j"                       % "log4j"               % "1.2.14"     % "test" // ApacheV2
-    val junitIntf   = "com.novocode"                % "junit-interface"     % "0.8"        % "test" // MIT
+    val commonsMath = "org.apache.commons"          % "commons-math"                 % "2.1"              % "test" // ApacheV2
+    val commonsIo   = "commons-io"                  % "commons-io"                   % "2.0.1"            % "test" // ApacheV2
+    val junit       = "junit"                       % "junit"                        % "4.10"             % "test" // Common Public License 1.0
+    val logback     = "ch.qos.logback"              % "logback-classic"              % "1.0.4"            % "test" // EPL 1.0 / LGPL 2.1
+    val mockito     = "org.mockito"                 % "mockito-all"                  % "1.8.1"            % "test" // MIT
+    val scalatest   = "org.scalatest"               % v("scalatest")                 % "1.9-2.10.0-M5-B2" % "test" // ApacheV2
+    val scalacheck  = "org.scalacheck"              % v("scalacheck")                % "1.10.0"           % "test" // New BSD
+    val ariesProxy  = "org.apache.aries.proxy"      % "org.apache.aries.proxy.impl"  % "0.3"              % "test"  // ApacheV2
+    val pojosr      = "com.googlecode.pojosr"       % "de.kalpatec.pojosr.framework" % "0.1.4"            % "test" // ApacheV2
+    val tinybundles = "org.ops4j.pax.tinybundles"   % "tinybundles"                  % "1.0.0"            % "test" // ApacheV2
+    val log4j       = "log4j"                       % "log4j"                        % "1.2.14"           % "test" // ApacheV2
+    val junitIntf   = "com.novocode"                % "junit-interface"              % "0.8"              % "test" // MIT
   }
 }