diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index efcd2d7a..1c9df208 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -58,6 +58,7 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ];
 fi
 
 # Remove legacy blocks created by old versions of this type
+# FIXME: remove me in 3.2+
 __block "$__object_name" \
    --file "$file" \
    --prefix "#cdist:$__object_name" \
diff --git a/docs/changelog b/docs/changelog
index 9477d8d0..df23d39f 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -5,7 +5,8 @@ Changelog
 	* Exception: No braces means author == Nico Schottelius
 
 
-next:
+3.1.0: 2014-03-19
+	* New Type: __rbenv
 	* Type __file: Enhance OpenBSD Support (og)
 	* Type __git: Pass onwer/group/mode values to __directory
 	* Type __iptable_rule: Fix example documentation (Antoine Catton)
@@ -14,7 +15,6 @@ next:
 	* Type __ssh_authorized_keys: Allow managing existing keys (Steven Armstrong)
 	* Type __user: Enhance OpenBSD Support (og)
 
-
 3.0.9: 2014-02-14
 	* Core: Ignore order dependencies if override is set (Daniel Heule)
 	* Core: Improve Mac OS X support for unit tests (Steven Armstrong)