diff --git a/Cabal/Distribution/Compat/Newtype.hs b/Cabal/Distribution/Compat/Newtype.hs
index 47958eb77fa4b506644d2ae5aa44d13920e4b2a8..e45e97cf9271f45182c0911c2542e81d07320ccb 100644
--- a/Cabal/Distribution/Compat/Newtype.hs
+++ b/Cabal/Distribution/Compat/Newtype.hs
@@ -55,7 +55,7 @@ ala pa hof = alaf pa hof id
 -- |
 --
 -- >>> alaf Sum foldMap length ["cabal", "install"]
--- 11
+-- 12
 --
 -- /Note:/ as with 'ala', the user supplied function for the newtype is /ignored/.
 alaf :: (Newtype n o, Newtype n' o') => (o -> n) -> ((a -> n) -> b -> n') -> (a -> o) -> (b -> o')
diff --git a/Cabal/Distribution/Verbosity.hs b/Cabal/Distribution/Verbosity.hs
index 8b13d42e2e9dad2b315792fe85ff3ad6c3d64bc7..f6df3f54fce8e52a7ab5da1fe21ad22994a7bd0a 100644
--- a/Cabal/Distribution/Verbosity.hs
+++ b/Cabal/Distribution/Verbosity.hs
@@ -291,3 +291,8 @@ isVerboseTimestamp = isVerboseFlag VTimestamp
 -- | Helper function for flag testing functions.
 isVerboseFlag :: VerbosityFlag -> Verbosity -> Bool
 isVerboseFlag flag = (Set.member flag) . vFlags
+
+-- $setup
+-- >>> import Test.QuickCheck (Arbitrary (..), arbitraryBoundedEnum)
+-- >>> instance Arbitrary VerbosityLevel where arbitrary = arbitraryBoundedEnum
+-- >>> instance Arbitrary Verbosity where arbitrary = fmap mkVerbosity arbitrary
diff --git a/Makefile b/Makefile
index 47cc2dc0c1e1fd6fb3554cbf5e245abd49ddec4e..9d90f05c214355cd08421ae1f3ad4e420bebe7d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : all lexer lib exe
+.PHONY : all lexer lib exe doctest
 
 LEXER_HS:=Cabal/Distribution/Parsec/Lexer.hs
 
@@ -14,3 +14,6 @@ lib : $(LEXER_HS)
 
 exe : $(LEXER_HS)
 	cabal new-build  --enable-tests cabal
+
+doctest :
+	doctest --fast Cabal/Distribution Cabal/Language