diff --git a/HAppS-State.cabal b/HAppS-State.cabal
--- a/HAppS-State.cabal
+++ b/HAppS-State.cabal
@@ -1,5 +1,5 @@
 Name:                HAppS-State
-Version:             0.9.2
+Version:             0.9.2.1
 Synopsis:            Event-based distributed state.
 Description:         Web framework
 License:             BSD3
diff --git a/src/HAppS/State/Checkpoint.hs b/src/HAppS/State/Checkpoint.hs
--- a/src/HAppS/State/Checkpoint.hs
+++ b/src/HAppS/State/Checkpoint.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fglasgow-exts -fth #-}
+{-# OPTIONS -fglasgow-exts -cpp -fth #-}
 module HAppS.State.Checkpoint
     ( createTxControl
     , closeTxControl
@@ -42,7 +42,11 @@
     } deriving (Typeable,Show)
 
 instance Version State
+#ifndef __HADDOCK__
 $(deriveSerialize ''State)
+#else
+instance Serialize State
+#endif
 
 createTxControl :: (Methods state, Component state) =>
                    Saver -> Proxy state -> IO (MVar TxControl)
diff --git a/src/HAppS/State/Transaction.hs b/src/HAppS/State/Transaction.hs
--- a/src/HAppS/State/Transaction.hs
+++ b/src/HAppS/State/Transaction.hs
@@ -44,7 +44,11 @@
 
 
 instance Version TxContext -- Default to version 0
+#ifndef __HADDOCK__
 $(deriveSerialize ''TxContext)
+#else
+instance Serialize TxContext
+#endif
 
 instance Version StdGen
 instance Serialize StdGen where