diff --git a/CHANGELOG.md b/CHANGELOG.md
index 317a865f4..24599f0ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,35 @@
 Starling: Changelog
 ===================
 
+version 2.4 - 2018-06-04
+------------------------
+
+- added completely rewritten AssetManager, to be found in the `starling.assets` package
+  - supports custom asset types (in addition to the available textures, sounds, XMLs, etc.)
+  - supports custom asset factories (factories load specific asset types)
+  - supports custom post processors (executed when all assets are loaded)
+  - supports custom data loaders (an object that loads data from local or remote resources)
+  - supports nesting of Asset Managers
+  - supports being used without active Starling instance (for assets that don't require a context)
+  - more intuitive callbacks in the `loadQueue` method
+  - better error handling
+- added support for 8k textures (as added in AIR 29 beta for Desktop targets)
+- added support for the Context3D option 'wantsBestResolutionOnBrowserZoom' via 'Starling.supportBrowserZoom'
+- added optional 'cameraPos' to RenderTexture's draw methods
+- added 'Painter.enableBatchTrimming()' (refs #1023)
+- added workaround for ADL mouse problem on Surface Books (closes #1022) (thanks to Josh!)
+- added ENHANCED stage3D profile to 'auto' profile list (closes #1019)
+- added warning when TextureAtlas or BitmapFont textures are missing
+- added 'copyFrom' method to TextureOptions
+- added warning whenever 'enableErrorChecking' is enabled (closes #1014)
+- optimized memory management by avoiding several 'ByteArray.clear' calls (refs #1027)
+- optimized memory handling in AOT mode by replacing some Vectors with Arrays
+- raised AIR SDK references to version 29
+- fixed Animate CC sprite sheet support by duplicating pivot points across textures with the same prefix (refs #445)
+- fixed that filter and mask on 'this' were ignored by 'DisplayObject.drawToBitmapData'
+- fixed that Juggler.elapsedTime was not raised while juggler was empty
+- fixed floating point problems in texture frame warning
+
 version 2.3 - 2017-12-18
 ------------------------
 
diff --git a/starling/build/ant/build.properties b/starling/build/ant/build.properties
index 4be458984..118b3c7a9 100644
--- a/starling/build/ant/build.properties
+++ b/starling/build/ant/build.properties
@@ -1,5 +1,5 @@
 # basic properties
-version = 2.3.1
+version = 2.4
 src.dir = ${basedir}/src
 deploy.dir = ${basedir}/bin
 doc.dir = ${basedir}/doc/html
diff --git a/starling/build/gradle/build.gradle b/starling/build/gradle/build.gradle
index 32b9fbb8f..ac3f80849 100644
--- a/starling/build/gradle/build.gradle
+++ b/starling/build/gradle/build.gradle
@@ -77,7 +77,7 @@ ant.FLASH_PLAYER_EXE = FLASH_PLAYER_EXE
 //----------------------------------
 
 // Set default properties
-version = '2.3.1-SNAPSHOT'
+version = '2.4'
 group = 'com.gamua'
 
 // Get version from Jenkins CI
diff --git a/starling/src/starling/core/Starling.as b/starling/src/starling/core/Starling.as
index 4eb1c9232..b31682085 100644
--- a/starling/src/starling/core/Starling.as
+++ b/starling/src/starling/core/Starling.as
@@ -196,7 +196,7 @@ package starling.core
     public class Starling extends EventDispatcher
     {
         /** The version of the Starling framework. */
-        public static const VERSION:String = "2.3.1";
+        public static const VERSION:String = "2.4";
         
         // members