diff --git a/CHANGELOG b/CHANGELOG
index 3ff4cb574..25b01fce5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 2.4.0 (2017-XX-XX)
+* 2.4.0 (2017-06-05)
 
  * added support for PHPUnit 6 when testing extensions
  * fixed PHP 7.2 compatibility
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 0c8fc2cdf..a20fd77b6 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,12 +16,12 @@
  */
 class Twig_Environment
 {
-    const VERSION = '2.4.0-DEV';
+    const VERSION = '2.4.0';
     const VERSION_ID = 20400;
     const MAJOR_VERSION = 2;
     const MINOR_VERSION = 4;
     const RELEASE_VERSION = 0;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     private $charset;
     private $loader;