diff --git a/AUTHORS b/AUTHORS
index 1a50d8020ab5997328a2b9b3d6bd03be2ea26286..719123fb0cddffd2b30ddaaf03a2acca82078945 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,7 @@
-MAIN DEVELOPERS:
-Nikos Skalkotos <skalkoto@grnet.gr>
-
-CONTRIBUTORS:
-Alex Pyrgiotis <apyrgio@cslab.ece.ntua.gr>
-Vangelis Koukis <vkoukis@grnet.gr>
-Giannis Spiliopoulos <gspilio@admin.grnet.gr>
-Konstantinos Tompoulidis <kostikas@grnet.gr>
+Nikos Skalkotos
+Alex Pyrgiotis
+Vangelis Koukis
+Giannis Spiliopoulos
+Konstantinos Tompoulidis
+Dionysis Grigoropoulos
 
diff --git a/ChangeLog b/ChangeLog
index 5116a2d3f71df41a7f98357abeb83ed02993f0d3..852b0eeda8a73ff59d8137b1f953112e63da57be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-10, v0.6.2
+	* Add support for Ubuntu 14.04
+	* Fix a bug in Windows image creation
+	* Add .kamaki.log in the user's personal data to be removed
+	* Fix minor issues in the documentation
+
 2014-01-10, v0.6.1
 	* Comply with the AstakosClient changes made in kamaki 0.12
 
diff --git a/docs/conf.py b/docs/conf.py
index 75b97f8cd63fc56da57492bc6a10638707e34176..cade830ca2c407c3547cef7092f78b587d012524 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,6 +14,10 @@
 
 import sys
 import os
+import imp
+
+VERSION = getattr(imp.load_source(
+        'image_creator.version', '../image_creator/version.py'), '__version__')
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -43,16 +47,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'snf-image-creator'
-copyright = u'2012, 2013 GRNET S.A. All rights reserved'
+copyright = u'2012-2014 GRNET S.A. All rights reserved'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.1'
+version = VERSION
 # The full version, including alpha/beta/rc tags.
-release = '0.6.1'
+release = VERSION
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/usage.rst b/docs/usage.rst
index 4c1a977343ab558f13a7f3241906313406c4760d..c9a11e802279c644cd85f474cebf4f4d7675ea0e 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -314,8 +314,8 @@ them or perform system preparation operations.
 Logical Volumes
 ---------------
 
-The program cannot work on LVM partitions [#f1]_. The input media may only
-contain primary or logical partitions.
+The program cannot work on input media that contain LVM partitions inside
+[#f1]_. The input media may only contain primary or logical partitions.
 
 Para-virtualized drivers
 ------------------------
diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index b3108e52c7cbb5a02561a3058d6cf826a6c3c746..491aa64d37057405df567df6eea2008c195b46b7 100644
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -48,7 +48,8 @@ class Unix(OSBase):
         '.gnupg',
         '.ssh',
         '.kamakirc',
-        '.kamaki.history'
+        '.kamaki.history',
+        '.kamaki.log'
     ]
 
     def _mountpoints(self):
diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py
index 5d791d3f1ba4c36630e3fbeb66b983ca0ad69340..54ac66e1be70dacb71f5358ff3a4d952c17cec85 100644
--- a/image_creator/os_type/windows.py
+++ b/image_creator/os_type/windows.py
@@ -209,7 +209,8 @@ class Windows(OSBase):
         """Clear all the event logs"""
 
         self._guest_exec(
-            r"cmd /q /c for /f %l in ('wevtutil el') do wevtutil cl %l")
+            "cmd /q /c for /f \"tokens=*\" %l in ('wevtutil el') do "
+            "wevtutil cl \"%l\"")
 
     @sysprep('Executing Sysprep on the image (may take more that 10 min)')
     def microsoft_sysprep(self):
diff --git a/image_creator/version.py b/image_creator/version.py
index bc172ff677dc8035675fbdd67f3be2b53453f2d4..79d04ddadba4130894792fc69d23033464b087a6 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,7 +1,8 @@
-__version__ = "0.6.1next"
+
+__version__ = "0.6.2next"
 __version_vcs_info__ = {
-    'branch': 'master',
-    'revid': '280a0e5',
-    'revno': 430}
+    'branch': 'develop',
+    'revid': '15e2ef7',
+    'revno': 452}
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"
diff --git a/image_creator/winexe.py b/image_creator/winexe.py
index b6c00bc3a5c30a96919d9bb40bd0e9282bb3042e..80bdea96587ec5b7c4f09d2ba49c6109d9a8a54d 100644
--- a/image_creator/winexe.py
+++ b/image_creator/winexe.py
@@ -38,7 +38,7 @@
 import subprocess
 import time
 import signal
-import distutils
+from sh import which
 
 from image_creator.util import FatalError
 
@@ -53,7 +53,7 @@ class WinEXE:
 
     @staticmethod
     def is_installed(program='winexe'):
-        return distutils.spawn.find_executable(program) is not None
+        return which(program) is not None
 
     def __init__(self, username, password, hostname, program='winexe'):
         self._host = hostname
diff --git a/version b/version
index 535e5d073af55a53c021e9bfc2982881225b190c..1131e8d08cd292719cfedeb483a72170855a834c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6.1next
+0.6.2next