diff --git a/change_log.txt b/change_log.txt
index 440829fe..2536d365 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,8 @@
  ===== 3.1.22-dev ===== (xx.xx.2015)
+ 10.05.2015
+  - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
+  - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
+
  07.05.2015
   - improvement of the debugging console. Read NEW_FEATURES.txt
   - optimization of resource class loading
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index e87f6d8d..07449256 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.22-dev/30';
+    const SMARTY_VERSION = '3.1.22-dev/31';
 
     /**
      * define variable scopes