diff --git a/lib/util.py b/lib/util.py
index f902b0a..1c2d3e8 100644
--- a/lib/util.py
+++ b/lib/util.py
@@ -6,6 +6,11 @@ import binascii
 import settings
 import bitcoin_rpc
 from hashlib import sha256
+from sha3 import sha3_256
+
+if settings.COINDAEMON_ALGO == 'keccak':
+    import sha3
+
 
 def deser_string(f):
     nit = struct.unpack("<B", f.read(1))[0]
@@ -176,14 +181,17 @@ def address_to_pubkeyhash(addr):
 
     if addr is None:
         return None
-    
+
     ver = addr[0]
     cksumA = addr[-4:]
-    cksumB = doublesha(addr[:-4])[:4]
+    #TODO: We should clean this up so that it works with not Keccek implementations too.
+    cksumB = sha3_256(addr[:-4]).digest()[:4]
     
+    #cksumB = sha3.sha3_256(addr[:-4]).digest()[:4]
+
     if cksumA != cksumB:
         return None
-    
+
     return (ver, addr[1:-4])
 
 def ser_uint256_be(u):