diff --git a/Control/Exception/Extensible.hs b/Control/Exception/Extensible.hs
--- a/Control/Exception/Extensible.hs
+++ b/Control/Exception/Extensible.hs
@@ -1,3 +1,6 @@
+#if __GLASGOW_HASKELL__ >= 701
+{-# LANGUAGE Trustworthy #-}
+#endif
 -------------------------
 -- | 
 -- Module      :  Control.Exception
diff --git a/extensible-exceptions.cabal b/extensible-exceptions.cabal
--- a/extensible-exceptions.cabal
+++ b/extensible-exceptions.cabal
@@ -1,19 +1,28 @@
 name:           extensible-exceptions
-version:        0.1.1.1
+version:        0.1.1.4
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries@haskell.org
 bug-reports: http://hackage.haskell.org/trac/ghc/newticket?component=libraries%20%28other%29
 synopsis:       Extensible exceptions
+category:       Control
 description:
     This package provides extensible exceptions for both new and 
     old versions of GHC (i.e., < 6.10).
-cabal-version:  >=1.6
+-- We want to remain compatible with older Cabal versions for now,
+-- but we need at least 1.2.3 in order to list DeriveDataTypeable
+-- as an extension.
+-- (GHC trac #3931)
+-- cabal-version:  >=1.6
+cabal-version:  >=1.2.3
 build-type: Simple
 
-source-repository head
-    type:     darcs
-    location: http://darcs.haskell.org/packages/extensible-exceptions/
+-- We want to remain compatible with older Cabal versions for now,
+-- and they don't understand source-repository sections
+-- (GHC trac #3931)
+-- source-repository head
+--     type:     git
+--     location: http://darcs.haskell.org/packages/extensible-exceptions.git/
 
 Library {
     if impl(ghc>=6.9)