diff --git a/HAppS-Util.cabal b/HAppS-Util.cabal
--- a/HAppS-Util.cabal
+++ b/HAppS-Util.cabal
@@ -1,5 +1,5 @@
 Name:                HAppS-Util
-Version:             0.9.2
+Version:             0.9.2.1
 Synopsis:            Web framework
 License:             BSD3
 License-file:        COPYING
@@ -31,6 +31,6 @@
                      RecursiveDo,
                      RankNTypes, FlexibleInstances,
                      TypeSynonymInstances
-cpp-options:         -DHADDOCK -DUNIX
+cpp-options:         -DUNIX
 ghc-options:         -W -fno-warn-incomplete-patterns
 GHC-Prof-Options:    -auto-all
diff --git a/src/HAppS/Crypto/MD5.hs b/src/HAppS/Crypto/MD5.hs
--- a/src/HAppS/Crypto/MD5.hs
+++ b/src/HAppS/Crypto/MD5.hs
@@ -58,7 +58,7 @@
 md5 bs = md5Finalize $ md5Update md5InitialContext bs
 
 md5Finalize :: MD5Context -> L.ByteString
-#ifdef HADDOCK
+#ifndef __HADDOCK__
 md5Finalize !ctx@(MD5Ctx (MD5Par _ _ _ _) rem !totLen) =
 	let totLen' = (totLen + 8*fromIntegral l) :: Word64
 	    padBS = B.pack $ 0x80 : replicate lenZeroPad 0 ++ size_split 8 totLen'
@@ -75,8 +75,8 @@
 	lenZeroPad = if (l+1) <= blockSizeBytes - 8
 			then (blockSizeBytes - 8) - (l+1)
 			else (2*blockSizeBytes - 8) - (l+1)
-
 #endif
+
 -- size_split :: Int -> a -> [Word8]
 size_split 0 _ = []
 size_split p n = (fromIntegral d):size_split (p-1) n'
@@ -99,7 +99,7 @@
 -- Assumes ByteString length == blockSizeBytes, will fold the 
 -- context across calls to applyMD5Rounds.
 performMD5Update :: MD5Context -> ByteString -> MD5Context
-#ifdef HADDOCK
+#ifndef __HADDOCK__
 performMD5Update !ctx@(MD5Ctx !par@(MD5Par !a !b !c !d) _ !len) bs =
 	let MD5Par a' b' c' d' = applyMD5Rounds par bs
 	in if B.length bs == blockSizeBytes
@@ -112,7 +112,7 @@
 
 #endif
 applyMD5Rounds :: MD5Partial -> ByteString -> MD5Partial
-#ifdef HADDOCK
+#ifndef __HADDOCK__
 applyMD5Rounds (MD5Par a b c d) w =
 	let -- Round 1
 	    !r0 = ff   a  b  c  d   (w!!0)  7  3614090360