diff --git a/VERSION b/VERSION
index a59a1788..88c016aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.29.07.50.41
+Version 2.6.0-development+timestamp.2013.07.30.09.11.35
diff --git a/gluon/utils.py b/gluon/utils.py
index 848b80ad..57e29a4f 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -46,7 +46,7 @@ import hmac
 try:
     try:
         from contrib.pbkdf2_ctypes import pbkdf2_hex
-    except ImportError:
+    except (ImportError, AttributeError):
         from contrib.pbkdf2 import pbkdf2_hex
     HAVE_PBKDF2 = True
 except ImportError: