diff --git a/ChangeLog b/ChangeLog
index a7626606d244fc81763dbc47cf96d747e4044ae2..42625105a9003c0f2b6809de24f11cedc4a14024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-06, v0.7.1
+	* Fix a bug in host bundling operation where the file system UUIDs and
+	  Labels where not preserved
+	* Fix a few bugs in the Windows deployment code
+	* Successfully detect Lubuntu and Xubuntu systems
+	* Update the documentation
+
 2014-09-26, v0.7
 	* Support all QEMU supported disk image formats as input media
 	* Detect if a Windows input media is sysprepped
diff --git a/image_creator/version.py b/image_creator/version.py
index 936075f601fcf5f6df90bee2cf3cdc5f7f0d2a1f..2076692dae1c90f7fa129fb7dc8aa9d925face4b 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,8 @@
 
-__version__ = "0.7"
+__version__ = "0.7.1"
 __version_vcs_info__ = {
-    'branch': 'master',
-    'revid': 'ab4d13b',
-    'revno': 571}
+    'branch': 'hotfix-0.7.1',
+    'revid': '080bf9c',
+    'revno': 578}
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"
diff --git a/version b/version
index eb49d7c7fdcbb1b4745de39837864aa7f78570ac..39e898a4f952d339c155a7939d571a5fdd6c8cfc 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.7
+0.7.1