diff --git a/ChangeLog b/ChangeLog
index 2b8d47f95f95c0e7f76dced37a94c30cb298b004..5116a2d3f71df41a7f98357abeb83ed02993f0d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-01-10, v0.6.1
+	* Comply with the AstakosClient changes made in kamaki 0.12
+
 2014-01-08, v0.6
 	* Rename the dialog-based application to snf-image-creator and the
 	  non-interactive command line one to snf-mkimage
diff --git a/docs/conf.py b/docs/conf.py
index e4c80a747e78f3558170649b67e4c989fc219c3e..75b97f8cd63fc56da57492bc6a10638707e34176 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.6'
+version = '0.6.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.6'
+release = '0.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 36695266685b1667d231eda279ee8124e1a7bcd7..07df8d9c6ee10dd48a1aa352427e353d1db2674e 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -46,7 +46,7 @@ from kamaki.cli.config import Config
 from kamaki.clients import ClientError
 from kamaki.clients.image import ImageClient
 from kamaki.clients.pithos import PithosClient
-from kamaki.clients.astakos import AstakosClient
+from kamaki.clients.astakos import CachedAstakosClient as AstakosClient
 
 try:
     config = Config()
diff --git a/image_creator/version.py b/image_creator/version.py
index 9fa443e5c041c27e31330e6b72ecde4878d76fad..bc172ff677dc8035675fbdd67f3be2b53453f2d4 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,7 @@
-
-__version__ = "0.6next"
+__version__ = "0.6.1next"
 __version_vcs_info__ = {
-    'branch': 'develop',
-    'revid': '94db968',
-    'revno': 427}
+    'branch': 'master',
+    'revid': '280a0e5',
+    'revno': 430}
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"
diff --git a/version b/version
index 4f3767f5d7efaabb15ebcc0a55b0d03fb43e5e4a..535e5d073af55a53c021e9bfc2982881225b190c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6next
+0.6.1next