diff --git a/Stackage/Config.hs b/Stackage/Config.hs
index 0733822e..125a722c 100644
--- a/Stackage/Config.hs
+++ b/Stackage/Config.hs
@@ -339,12 +339,20 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
         ]
 
     mapM_ (add "Chris Done") $ words =<<
-        [ "ace check-email freenect frisby gd haskell-docs "
+        [ "ace check-email freenect frisby gd"
         , "hostname-validate ini lucid osdkeys pdfinfo"
-        , "pure-io scrobble sourcemap shell-conduit" ]
+        , "pure-io scrobble sourcemap shell-conduit"
+        ]
 
         -- https://github.com/nominolo/atto-lisp/issues/15
         -- present
+
+    -- Requires older haddock currently
+    when (ghcVer /= GhcMajorVersion 7 8 || requireHP) $
+        mapM_ (add "Chris Done") $ words =<<
+            [ "haskell-docs"
+            ]
+
     -- TODO: Add hindent and structured-haskell-mode once they've been ported to HSE 1.16.
 
 #if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)