diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 env:
  - GHCVER=7.4.2 CABALVER=1.16
  - GHCVER=7.6.3 CABALVER=1.18
- - GHCVER=head CABALVER=1.18 
+ - GHCVER=7.8.2 CABALVER=1.20
+ - GHCVER=head CABALVER=1.20
 
 before_install:
  - sudo add-apt-repository -y ppa:hvr/ghc
@@ -20,5 +21,5 @@
 
 matrix:
   allow_failures:
-   - env: GHCVER=head CABALVER=1.18
+   - env: GHCVER=head CABALVER=1.20
   fast_finish: true
diff --git a/quickcheck-property-monad.cabal b/quickcheck-property-monad.cabal
--- a/quickcheck-property-monad.cabal
+++ b/quickcheck-property-monad.cabal
@@ -1,5 +1,5 @@
 name: quickcheck-property-monad
-version: 0.2.1
+version: 0.2.2
 cabal-version: >=1.10
 build-type: Custom
 license: BSD3
@@ -10,25 +10,32 @@
 homepage: http://github.com/bennofs/quickcheck-property-monad/
 bug-reports: http://github.com/bennofs/quickcheck-property-monad/issues
 synopsis: quickcheck-property-monad
-description: quickcheck-property-monad
+description:
+    quickcheck-property-monad
 category: Testing
 author: Benno Fünfstück
-data-dir: ""
-extra-source-files: .ghci .gitignore .travis.yml .vim.custom
-                    README.md
-
-flag tests
-  manual: False
-  description: Run tests (requires QuickCheck >= 2.7)
+extra-source-files:
+    .ghci
+    .gitignore
+    .travis.yml
+    .vim.custom
+    README.md
  
 source-repository head
     type: git
     location: https://github.com/bennofs/quickcheck-property-monad.git
  
+flag tests
+    Description:  Run tests (requires QuickCheck >= 2.7)
+ 
 library
-    build-depends: base >=4.5 && <4.8, either >=4.1.1 && <4.2,
-                   transformers >=0.3.0.0 && <0.4, QuickCheck >=2.5.1.1 && <2.8
-    exposed-modules: Test.QuickCheck.Property.Monad
+    build-depends:
+        base >=4.5 && <4.8,
+        either >=4.1.1 && <4.4,
+        transformers >=0.3.0.0 && <0.4,
+        QuickCheck >=2.5.1.1 && <2.8
+    exposed-modules:
+        Test.QuickCheck.Property.Monad
     exposed: True
     buildable: True
     default-language: Haskell2010
@@ -36,17 +43,23 @@
     ghc-options: -Wall
  
 test-suite doctests
-    build-depends: base >=4.5 && <4.8, directory >=1.1.0.2 && <1.3,
-                   doctest >=0.9.11 && <0.10, filepath >=1.3.0.0 && <1.4
+    build-depends:
+        base >=4.5 && <4.8,
+        directory >=1.1.0.2 && <1.3,
+        doctest >=0.9.11 && <0.10,
+        filepath >=1.3.0.0 && <1.4
      
     if impl(ghc <7.6.1)
+        buildable: True
         ghc-options: -Werror
+     
     if flag(tests)
-       build-depends: QuickCheck ==2.7.*
-       buildable: True
-    buildable: False
+        build-depends:
+            QuickCheck ==2.7.*
+        buildable: True
     type: exitcode-stdio-1.0
     main-is: doctests.hs
+    buildable: False
     default-language: Haskell2010
     hs-source-dirs: tests
     ghc-options: -Wall -threaded