diff --git a/fixtures/all-versions.bash b/fixtures/all-versions.bash
index 232c3d13..0bf6a63a 100644
--- a/fixtures/all-versions.bash
+++ b/fixtures/all-versions.bash
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github
index a1fd0441..053ec320 100644
--- a/fixtures/all-versions.github
+++ b/fixtures/all-versions.github
@@ -443,7 +443,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
+          if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/all-versions.travis b/fixtures/all-versions.travis
index f48e088c..1f1211d7 100644
--- a/fixtures/all-versions.travis
+++ b/fixtures/all-versions.travis
@@ -277,7 +277,7 @@ script:
   # cabal check...
   - (cd ${PKGDIR_splitmix} && ${CABAL} -vnormal check)
   # haddock...
-  - if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
+  - if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/copy-fields-all.bash b/fixtures/copy-fields-all.bash
index 4cbf28ed..d5dbc605 100644
--- a/fixtures/copy-fields-all.bash
+++ b/fixtures/copy-fields-all.bash
@@ -540,7 +540,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/copy-fields-all.github b/fixtures/copy-fields-all.github
index b21ec1e8..6523b6bb 100644
--- a/fixtures/copy-fields-all.github
+++ b/fixtures/copy-fields-all.github
@@ -380,7 +380,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/copy-fields-all.travis b/fixtures/copy-fields-all.travis
index f7808a25..be09d4e1 100644
--- a/fixtures/copy-fields-all.travis
+++ b/fixtures/copy-fields-all.travis
@@ -267,7 +267,7 @@ script:
   - (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/copy-fields-none.bash b/fixtures/copy-fields-none.bash
index 0089176e..edf57075 100644
--- a/fixtures/copy-fields-none.bash
+++ b/fixtures/copy-fields-none.bash
@@ -529,7 +529,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/copy-fields-none.github b/fixtures/copy-fields-none.github
index 2d835050..0dadffc1 100644
--- a/fixtures/copy-fields-none.github
+++ b/fixtures/copy-fields-none.github
@@ -369,7 +369,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/copy-fields-none.travis b/fixtures/copy-fields-none.travis
index 21956f55..b653543a 100644
--- a/fixtures/copy-fields-none.travis
+++ b/fixtures/copy-fields-none.travis
@@ -245,7 +245,7 @@ script:
   - (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/copy-fields-some.bash b/fixtures/copy-fields-some.bash
index c2f07c82..78b1ec69 100644
--- a/fixtures/copy-fields-some.bash
+++ b/fixtures/copy-fields-some.bash
@@ -532,7 +532,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/copy-fields-some.github b/fixtures/copy-fields-some.github
index befc3014..3f3903a2 100644
--- a/fixtures/copy-fields-some.github
+++ b/fixtures/copy-fields-some.github
@@ -372,7 +372,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/copy-fields-some.travis b/fixtures/copy-fields-some.travis
index 88beea15..5fbc55e2 100644
--- a/fixtures/copy-fields-some.travis
+++ b/fixtures/copy-fields-some.travis
@@ -251,7 +251,7 @@ script:
   - (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/empty-line.bash b/fixtures/empty-line.bash
index d20edcbd..f0337f9b 100644
--- a/fixtures/empty-line.bash
+++ b/fixtures/empty-line.bash
@@ -532,7 +532,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/empty-line.github b/fixtures/empty-line.github
index b3d38383..3f296672 100644
--- a/fixtures/empty-line.github
+++ b/fixtures/empty-line.github
@@ -386,7 +386,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/empty-line.travis b/fixtures/empty-line.travis
index c698b9dd..37ea4fe4 100644
--- a/fixtures/empty-line.travis
+++ b/fixtures/empty-line.travis
@@ -275,7 +275,7 @@ script:
   - (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/enabled-jobs.bash b/fixtures/enabled-jobs.bash
index e3f40a08..33a7b669 100644
--- a/fixtures/enabled-jobs.bash
+++ b/fixtures/enabled-jobs.bash
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd_if $((! GHCJSARITH)) $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github
index 9895fabe..887ce408 100644
--- a/fixtures/enabled-jobs.github
+++ b/fixtures/enabled-jobs.github
@@ -353,7 +353,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
+          if [ $((! GHCJSARITH)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/enabled-jobs.travis b/fixtures/enabled-jobs.travis
index 477675e5..fb562e0a 100644
--- a/fixtures/enabled-jobs.travis
+++ b/fixtures/enabled-jobs.travis
@@ -223,7 +223,7 @@ script:
   # cabal check...
   - (cd ${PKGDIR_splitmix} && ${CABAL} -vnormal check)
   # haddock...
-  - if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
+  - if [ $((! GHCJSARITH)) -ne 0 ] ; then ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/irc-channels.bash b/fixtures/irc-channels.bash
index dddbb345..daf1ef4c 100644
--- a/fixtures/irc-channels.bash
+++ b/fixtures/irc-channels.bash
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/irc-channels.github b/fixtures/irc-channels.github
index 506e5ea8..284c7aab 100644
--- a/fixtures/irc-channels.github
+++ b/fixtures/irc-channels.github
@@ -372,7 +372,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/irc-channels.travis b/fixtures/irc-channels.travis
index 7465b874..ca9a52ff 100644
--- a/fixtures/irc-channels.travis
+++ b/fixtures/irc-channels.travis
@@ -225,7 +225,7 @@ script:
   # cabal check...
   - (cd ${PKGDIR_servant} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/messy.bash b/fixtures/messy.bash
index ca8ad63f..f27e082c 100644
--- a/fixtures/messy.bash
+++ b/fixtures/messy.bash
@@ -533,7 +533,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/messy.github b/fixtures/messy.github
index 7653228f..2a08237e 100644
--- a/fixtures/messy.github
+++ b/fixtures/messy.github
@@ -387,7 +387,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/messy.travis b/fixtures/messy.travis
index 24c23fcf..2c007b24 100644
--- a/fixtures/messy.travis
+++ b/fixtures/messy.travis
@@ -269,7 +269,7 @@ script:
   - (cd ${PKGDIR_servant_docs} && ${CABAL} -vnormal check)
   - (cd ${PKGDIR_servant_server} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/psql.bash b/fixtures/psql.bash
index ac5350da..a53ea8e1 100644
--- a/fixtures/psql.bash
+++ b/fixtures/psql.bash
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/psql.github b/fixtures/psql.github
index fe2e59aa..bc35a9d4 100644
--- a/fixtures/psql.github
+++ b/fixtures/psql.github
@@ -351,7 +351,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/psql.travis b/fixtures/psql.travis
index 1b3a6544..d2386410 100644
--- a/fixtures/psql.travis
+++ b/fixtures/psql.travis
@@ -222,7 +222,7 @@ script:
   # cabal check...
   - (cd ${PKGDIR_servant} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/fixtures/travis-patch.bash b/fixtures/travis-patch.bash
index 86f202f1..2ab51386 100644
--- a/fixtures/travis-patch.bash
+++ b/fixtures/travis-patch.bash
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
 
 # haddock
 put_info "haddock"
-run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
 
 # unconstrained build
 put_info "unconstrained build"
diff --git a/fixtures/travis-patch.github b/fixtures/travis-patch.github
index 46c1acce..818683f3 100644
--- a/fixtures/travis-patch.github
+++ b/fixtures/travis-patch.github
@@ -345,7 +345,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: unconstrained build
         run: |
           rm -f cabal.project.local
diff --git a/fixtures/travis-patch.travis b/fixtures/travis-patch.travis
index 57680715..8c1a7575 100644
--- a/fixtures/travis-patch.travis
+++ b/fixtures/travis-patch.travis
@@ -218,7 +218,7 @@ script:
   # cabal check...
   - (cd ${PKGDIR_servant} && ${CABAL} -vnormal check)
   # haddock...
-  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
+  - ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
   # Building without installed constraints for packages in global-db...
   - rm -f cabal.project.local
   - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
diff --git a/src/HaskellCI/Bash.hs b/src/HaskellCI/Bash.hs
index 7bb60668..11f7ef30 100644
--- a/src/HaskellCI/Bash.hs
+++ b/src/HaskellCI/Bash.hs
@@ -200,7 +200,7 @@ makeBash _argv config@Config {..} prj jobs@JobVersions {..} = do
         -- haddock
         when (not (equivVersionRanges C.noVersion cfgHaddock)) $ step "haddock" $ do
             let range = RangeGHC /\ Range cfgHaddock
-            run_cmd_if range "$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
+            run_cmd_if range "$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
 
         -- unconstrained build
         unless (equivVersionRanges C.noVersion cfgUnconstrainted) $ step "unconstrained build" $ do
@@ -227,7 +227,7 @@ makeBash _argv config@Config {..} prj jobs@JobVersions {..} = do
                 when (csRunTests cs) $
                     run_cmd_cs' hasTests $ "$CABAL v2-test $ARG_COMPILER " ++ allFlags ++ " all"
                 when (csHaddock cs) $
-                    run_cmd_cs $ "$CABAL v2-haddock $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
+                    run_cmd_cs $ "$CABAL v2-haddock --haddock-all $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
 
     return defaultZ
         { zJobs =
diff --git a/src/HaskellCI/GitHub.hs b/src/HaskellCI/GitHub.hs
index e607d069..8f58d12f 100644
--- a/src/HaskellCI/GitHub.hs
+++ b/src/HaskellCI/GitHub.hs
@@ -560,7 +560,7 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
         -- haddock
         when (not (equivVersionRanges C.noVersion cfgHaddock)) $ githubRun "haddock" $ do
             let range = RangeGHC /\ Range cfgHaddock
-            sh_if range "$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
+            sh_if range "$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
 
         -- unconstrained build
         unless (equivVersionRanges C.noVersion cfgUnconstrainted) $ githubRun "unconstrained build" $ do
@@ -591,7 +591,7 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
             when (csRunTests cs) $
                 sh_cs' hasTests $ "$CABAL v2-test $ARG_COMPILER " ++ allFlags ++ " all"
             when (csHaddock cs) $
-                sh_cs $ "$CABAL v2-haddock $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
+                sh_cs $ "$CABAL v2-haddock --haddock-all $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
 
     -- assembling everything
     return GitHub
diff --git a/src/HaskellCI/Travis.hs b/src/HaskellCI/Travis.hs
index f99fccdd..8c3fabb6 100644
--- a/src/HaskellCI/Travis.hs
+++ b/src/HaskellCI/Travis.hs
@@ -377,7 +377,7 @@ makeTravis argv config@Config {..} prj jobs@JobVersions {..} = do
         -- haddock
         when (not (equivVersionRanges C.noVersion cfgHaddock)) $
             foldedSh FoldHaddock "haddock..." cfgFolds $
-                shForJob (RangeGHC /\ Range cfgHaddock) $ cabal $ "v2-haddock $WITHCOMPILER " ++ withHaddock ++ " ${TEST} ${BENCH} all"
+                shForJob (RangeGHC /\ Range cfgHaddock) $ cabal $ "v2-haddock --haddock-all $WITHCOMPILER " ++ withHaddock ++ " ${TEST} ${BENCH} all"
 
         -- unconstained build
         -- Have to build last, as we remove cabal.project.local
@@ -407,7 +407,7 @@ makeTravis argv config@Config {..} prj jobs@JobVersions {..} = do
                     when (csRunTests cs) $
                         shForCs' hasTests $ cabal $ "v2-test $WITHCOMPILER " ++ allFlags ++ " all --test-show-details=direct"
                     when (csHaddock cs) $
-                        shForCs $ cabal $ "v2-haddock $WITHCOMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
+                        shForCs $ cabal $ "v2-haddock --haddock-all $WITHCOMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
 
         -- At the end, we allow some raw travis scripts
         unless (null cfgRawTravis) $ do