diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 2b1dce7e10..d820b131c8 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -20,13 +20,16 @@ object AkkaBuild {
 
   lazy val buildSettings = Dependencies.Versions ++ Seq(
     organization := "com.typesafe.akka",
-    version := "2.5-SNAPSHOT")
+    // use the same value as in the build scope, so it can be overriden by stampVersion
+    version := (version in ThisBuild).value)
 
   lazy val rootSettings = Release.settings ++
     UnidocRoot.akkaSettings ++
     Formatting.formatSettings ++
     Protobuf.settings ++ Seq(
-      parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", parallelExecutionByDefault.toString).toBoolean)
+      parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", parallelExecutionByDefault.toString).toBoolean,
+      version in ThisBuild := "2.5-SNAPSHOT"
+    )
 
   lazy val mayChangeSettings = Seq(
     description := """|This module of Akka is marked as
diff --git a/project/TimeStampede.scala b/project/TimeStampede.scala
index 4a2dc611a5..6f8c3ba15b 100644
--- a/project/TimeStampede.scala
+++ b/project/TimeStampede.scala
@@ -23,7 +23,7 @@ object TimeStampede extends AutoPlugin {
 
   def stampVersion = Command.command("stampVersion") { state ⇒
     val extracted = Project.extract(state)
-    extracted.append(List(version in ThisBuild ~= stamp), state)
+    extracted.appendWithSession(List(version in ThisBuild ~= stamp), state)
   }
 
   def stamp(version: String): String = {