diff --git a/CHANGELOG b/CHANGELOG
index fdc9e2c62b..ed2a034833 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
-* 1.18.0 (2015-XX-XX)
+* 1.18.2 (2015-XX-XX)
+
+ * n/a
+
+* 1.18.0 (2015-01-25)
 
  * fixed some error messages where the line was wrong (unknown variables or argument names)
  * added a new way to customize the main Module node (via empty nodes)
diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h
index 13bb8cd307..36b5c7bd7d 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.18.0"
+#define PHP_TWIG_VERSION "1.18.1-DEV"
 
 #include "php.h"
 
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index 0cb9bb7cea..f72c9e80a6 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.18.0';
+    const VERSION = '1.18.1-DEV';
 
     protected $charset;
     protected $loader;