diff --git a/ChangeLog b/ChangeLog
index 51cf16707d0e9e3f546e615200b3b153043544f6..586fd3fc4f7faeeba5064dbc92f3a231abc96c9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-21, v0.4
+	* Populate the USERS metadata in Windows images
+	* Support kamaki 0.9 and synnefo 0.14
+	* Change the metadata file format to json
+	* Support the devflow building system
+
 2013-05-27, v0.3
 	* Support media hosting FreeBSD systems
 	* Check if remote files exist when uploading images to pithos
diff --git a/docs/conf.py b/docs/conf.py
index 2e40c86c509fb13fbf0d8871f1b19308ea6b5e77..28b2d666f365d1d6c5be7bd31321479f219804ad 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.3'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.3'
+release = '0.4'
 
 # 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 249fd433585e50447bb0e75c1314ba364ddb68e3..0fdf52e02083a33175a12887610ba30ee703294e 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,7 @@
-__version__ = "0.3next"
-__version_info__ = ['0', '3next']
+__version__ = "0.4"
+__version_info__ = ['0', '4']
 __version_vcs_info__ = {
-    'branch': 'develop',
-    'revid': '9c060ab',
-    'revno': 297,
-    'toplevel': '/home/skalkoto/src/snf-image-creator'}
+    'branch': 'master',
+    'revid': 'be73902',
+    'revno': 310}
 __version_user_info__ = "skalkoto@darkstar.admin.grnet.gr"
diff --git a/version b/version
index 51c4eb3d97a7ff09073a5346899cf0560cb93746..bd73f47072b1fe4b9914ec14a7f6d47fcc8f816a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.3next
+0.4