diff --git a/CHANGELOG b/CHANGELOG
index bba831ecf..752178969 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.6.4 (2012-XX-XX)
+* 1.6.4 (2012-04-02)
 
  * fixed PHP notice in Twig_Error::guessTemplateLine() introduced in 1.6.3
  * fixed performance when compiling large files
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index fc5acfbd0..752dd8247 100644
--- a/ext/twig/php_twig.h
+++ b/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.6.4-DEV"
+#define PHP_TWIG_VERSION "1.6.4"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 63cc5b0ed..596c8672e 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.6.4-DEV';
+    const VERSION = '1.6.4';
 
     protected $charset;
     protected $loader;