diff --git a/ChangeLog b/ChangeLog
index 586fd3fc4f7faeeba5064dbc92f3a231abc96c9c..262b2f1023a26ffb303d6d9718a0cf09618f0200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-21, v0.4.1
+	* Fix a bug that caused an abnormal termination when trying to
+	  determine the available users in a Windows image
+
 2013-06-21, v0.4
 	* Populate the USERS metadata in Windows images
 	* Support kamaki 0.9 and synnefo 0.14
diff --git a/docs/conf.py b/docs/conf.py
index 28b2d666f365d1d6c5be7bd31321479f219804ad..4d729c890981aef2aae68924cdb1554bc0cf6369 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.4'
+version = '0.4.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.4'
+release = '0.4.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 0fdf52e02083a33175a12887610ba30ee703294e..161d848580ed6e97a6e36491617a7d32ee17dc83 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,7 +1,7 @@
-__version__ = "0.4"
-__version_info__ = ['0', '4']
+__version__ = "0.4.1"
+__version_info__ = ['0', '4', '1']
 __version_vcs_info__ = {
     'branch': 'master',
-    'revid': 'be73902',
-    'revno': 310}
+    'revid': '628054a',
+    'revno': 313}
 __version_user_info__ = "skalkoto@darkstar.admin.grnet.gr"
diff --git a/version b/version
index bd73f47072b1fe4b9914ec14a7f6d47fcc8f816a..267577d47e497a0630bc454b3f74c4fd9a10ced4 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.4
+0.4.1