diff --git a/ChangeLog b/ChangeLog
index 831952de9edf666f0721b057110e1ba762ead136..67b0dc2961cc0242afedf339af69d3352427e35d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-23, v0.5.1
+	* Allow more characters in the cloud name
+	* Fix various bugs
+	* Handle kamaki config errors
+
 2013-08-04, v0.5
 	* Add support for sysprep-parameters
 	* Add support for syspreping Windows media
@@ -5,7 +10,7 @@
 
 2013-07-31, v0.4.4
 	* Fix a bug where the system tried to use file scrubbing without
-          checking if it was supported
+	  checking if it was supported
 
 2013-07-18, v0.4.3
 	* Force TERM=linux when working on xterm. This makes dialog behave
diff --git a/docs/conf.py b/docs/conf.py
index 377b013e3a25fedb3265f42d0a8e1417d5164315..8392d22492670dd9d22b8030830ef5af5618abd6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = u'2012, 2013 GRNET S.A. All rights reserved'
 # built documents.
 #
 # The short X.Y version.
-version = '0.5'
+version = '0.5.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.5'
+release = '0.5.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/image_creator/version.py b/image_creator/version.py
index ef9765b1fc7632c86451424fdb6933436f8c430e..59db0cb90748764ad97a7b99440c947213b47288 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,7 +1,7 @@
-__version__ = "0.5"
-__version_info__ = ['0', '5']
+__version__ = "0.5.1"
+__version_info__ = ['0', '5', '1']
 __version_vcs_info__ = {
-    'branch': 'master',
-    'revid': '5079560',
-    'revno': 387}
+    'branch': 'hotfix-0.5.1',
+    'revid': 'b25b422',
+    'revno': 393}
 __version_user_info__ = "skalkoto@darkstar.admin.grnet.gr"