diff --git a/Cabal/Distribution/Verbosity.hs b/Cabal/Distribution/Verbosity.hs
index f6df3f54fce..d9e3747c45e 100644
--- a/Cabal/Distribution/Verbosity.hs
+++ b/Cabal/Distribution/Verbosity.hs
@@ -129,15 +129,17 @@ lessVerbose v =
         Normal    -> v { vLevel = Silent }
         Silent    -> v
 
--- | Combinator for transforming verbosity level while retaining the original hidden state.
+-- | Combinator for transforming verbosity level while retaining the
+-- original hidden state.
 --
 -- For instance, the following property holds
 --
 -- prop> isVerboseNoWrap (modifyVerbosity (max verbose) v) == isVerboseNoWrap v
 --
--- __Note__: you can use @modifyVerbosity (const v1) v0@ to overwrite @v1@'s flags with @v0@'s flags.
+-- __Note__: you can use @modifyVerbosity (const v1) v0@ to overwrite
+-- @v1@'s flags with @v0@'s flags.
 --
--- @since 2.0.1
+-- @since 2.0.1.0
 modifyVerbosity :: (Verbosity -> Verbosity) -> Verbosity -> Verbosity
 modifyVerbosity f v = v { vLevel = vLevel (f v) }
 
diff --git a/travis-script.sh b/travis-script.sh
index dce642b322a..95ded28e68d 100755
--- a/travis-script.sh
+++ b/travis-script.sh
@@ -104,8 +104,10 @@ if [ "x$CABAL_INSTALL_ONLY" != "xYES" ] ; then
     # Cabal otherwise).
     timed cabal new-build $jobs Cabal Cabal:unit-tests Cabal:check-tests Cabal:parser-tests Cabal:parser-hackage-tests --enable-tests
 
-    # Run haddock
-    (cd Cabal && timed cabal act-as-setup --build-type=Simple -- haddock --builddir=${CABAL_BDIR}) || exit $?
+    # Run haddock.
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+        (cd Cabal && timed cabal act-as-setup --build-type=Simple -- haddock --builddir=${CABAL_BDIR}) || exit $?
+    fi
 
     # Check for package warnings
     (cd Cabal && timed cabal check) || exit $?
@@ -163,7 +165,9 @@ fi
 
 # Haddock
 # TODO: Figure out why this needs to be run before big tests
-(cd cabal-install && timed ${CABAL_INSTALL_SETUP} haddock --builddir=${CABAL_INSTALL_BDIR} ) || exit $?
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    (cd cabal-install && timed ${CABAL_INSTALL_SETUP} haddock --builddir=${CABAL_INSTALL_BDIR} ) || exit $?
+fi
 
 # Tests need this
 timed ${CABAL_INSTALL_BDIR}/build/cabal/cabal update