diff --git a/bin/cdist-config b/bin/cdist-config
index 4346c0cb..5d19f854 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -19,7 +19,7 @@
 #
 #
 
-__cdist_version="1.6.0"
+__cdist_version="1.6.1"
 
 # Fail if something bogus is going on
 set -u
diff --git a/doc/changelog b/doc/changelog
index 0560dee0..2fef50ca 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,30 +1,30 @@
-1.6.1:
+1.6.1: 2011-04-07
 	* Improved logging: Show code responsible for abort
 	* Improved logging: Consistently prefix with current object or core
 	* Bugfix: Type __debconf_set_selections used wrong contens for selection
 	* Bugfix: Don't fail, if cache directory is not existing
 	* Bugfix: __user and __group exited non-zero if no change was necessary
-	* New Explorer: hardware_type
-	* New Type: __package_pkg_openbsd (Andi Brönnimann)
-	* New Type: __autofs_map (Steven Armstrong)
-	* New Type: __autofs_master (Steven Armstrong)
+	* New Explorer hardware_type
+	* New Type __package_pkg_openbsd (Andi Brönnimann)
+	* New Type __autofs_map (Steven Armstrong)
+	* New Type __autofs_master (Steven Armstrong)
 
 1.6.0: 2011-04-06
-	* New Type __package_yum
-	* New type __debconf_set_selections
-	* New explorer os_version
-	* Fix Type __group in case of __group NAME syntax
-	* Fix __package* types: consistently name --state removed instead of
+	* New Type: __package_yum
+	* New type: __debconf_set_selections
+	* New explorer: os_version
+	* Bugfix: Type __group failed in case of __group NAME syntax
+	* Bugfix: __package* types: consistently name --state removed instead of
 		uninstalled or deinstalled
-	* Type __package gained Fedora support
-	* Removed --preseed support from __package_apt
-	* explorer/os: gained Fedora support
+	* Type __package: Added Fedora support
+	* Type __package_apt: Removed --preseed support
+	* Explorer os gained Fedora support
 	* Simplified types __user and __group
 	* New helper binary: cdist-mass-deploy
 
 1.5.0: 2011-04-01
 	* Add basic cache functionality
-	* New type __process
+	* New type: __process
 	* Restructured execution: (Steven Armstrong)
 		Orientate processing on objects, resolve dependencies and
 		ensure correct execution order.
@@ -32,8 +32,8 @@
 	* Documentation: Remove legacy man pages (Steven Armstrong)
 
 1.4.1: 2011-03-25
-	* New type __key_value (Steven Armstrong)
-	* New type __apt_ppa (Steven Armstrong)
+	* New type: __key_value (Steven Armstrong)
+	* New type: __apt_ppa (Steven Armstrong)
 	* Documentation: Manpage generation cleanup
 	* Documentation: Manpage fix for __apt_ppa
 
@@ -48,9 +48,9 @@
 	* Include HTML documentation of manpages and publish them
 
 1.3.1: 2011-03-21
-	* Document cdist-type-build-emulation
-	* Document cdist-type-emulator
-	* Document cdist-remote-explorer-run
+	* Document: cdist-type-build-emulation
+	* Document: cdist-type-emulator
+	* Document: cdist-remote-explorer-run
 	* Fix dependencies in cdist-code-run
 	* Fix dependencies in cdist-manifest-run-all
 	* Add --source to __issue and fix os check
@@ -62,33 +62,33 @@
 
 1.2.0: 2011-03-19
 	* Added dependencies (see cdist-type(7))
-	* New type __removeline (Daniel Roth)
-	* New type __group (Steven Armstrong)
-	* New type __user (Steven Armstrong)
-	* Document cdist-run-remote
-	* Document cdist-code-run-all
-	* Document cdist-object-gencode
-	* Document cdist-explorer-run-global
-	* Document cdist-manifest-run-init
-	* Document cdist-manifest-run-all
-	* Document cdist-object-gencode-all
-	* Document cdist-manifest-run
+	* New type: __removeline (Daniel Roth)
+	* New type: __group (Steven Armstrong)
+	* New type: __user (Steven Armstrong)
+	* Documentation: cdist-run-remote
+	* Documentation: cdist-code-run-all
+	* Documentation: cdist-object-gencode
+	* Documentation: cdist-explorer-run-global
+	* Documentation: cdist-manifest-run-init
+	* Documentation: cdist-manifest-run-all
+	* Documentation: cdist-object-gencode-all
+	* Documentation: cdist-manifest-run
 
 1.1.0: 2011-03-16
 	* Replace type __file with __file, __directory, __link
-	* Document cdist-env
-	* Document cdist-config
-	* Document cdist-dir
-	* Document cdist-quickstart
+	* Documentation: cdist-env
+	* Documentation: cdist-config
+	* Documentation: cdist-dir
+	* Documentation: cdist-quickstart
 
 1.0.4: 2011-03-15
-	* New type __motd
-	* New type __addifnosuchline (Daniel Roth)
-	* Document type __issue
-	* New type __user
-	* Document type __package
-	* Document type __package_pacman
-	* Document type __package_apt
+	* New type: __motd
+	* New type: __addifnosuchline (Daniel Roth)
+	* New type: __user
+	* Document type: __issue
+	* Document type: __package
+	* Document type: __package_pacman
+	* Document type: __package_apt
 	* New parameter for __file: --owner and --group
 
 1.0.3: 2011-03-11