diff --git a/CHANGELOG b/CHANGELOG
index c244d308a..23413dee5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* 1.8.0 (2012-XX-XX)
+* 1.8.0 (2012-05-08)
 
  * enforced interface when adding tests, filters, functions, and node visitors from extensions
  * fixed a side-effect of the date filter where the timezone might be changed
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 78f1136e2..ec748359e 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.8.0-DEV"
+#define PHP_TWIG_VERSION "1.8.0"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index a290db810..81c8fe6cb 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -17,7 +17,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.8.0-DEV';
+    const VERSION = '1.8.0';
 
     protected $charset;
     protected $loader;