diff --git a/build-constraints.yaml b/build-constraints.yaml
index 36a626ea..0b0ca66a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -816,8 +816,10 @@ packages:
         - language-ecmascript
 
     "Tom Ellis <tom-stackage@jaguarpaw.co.uk>":
+        []
         # GHC 8 - opaleye
-        - product-profunctors
+        # https://github.com/tomjaguarpaw/product-profunctors/issues/16
+        # GHC 8 - product-profunctors
 
     "Samplecount stefan@samplecount.com @kaoskorobase":
         - shake-language-c
@@ -1199,7 +1201,8 @@ packages:
         # GHC 8 - github-release
         - lackey
         # GHC 8 - octane
-        - optparse-generic # Maintained by @Gabriel439.
+        # https://github.com/Gabriel439/Haskell-Optparse-Generic-Library/issues/23
+        # GHC 8 - optparse-generic # Maintained by @Gabriel439.
         # https://github.com/tfausak/ratel/issues/1
         # GHC 8 - ratel
         # GHC 8 - ratel-wai
@@ -1830,7 +1833,8 @@ packages:
         - scanner
 
     "Stanislav Chernichkin <schernichkin@gmail.com> @schernichkin":
-        - partial-isomorphisms
+        []
+        # GHC 8 - partial-isomorphisms
         # GHC 8 - vinyl
 
     "Christoph Breitkopf <chbreitkopf@gmail.com> @bokesan":
@@ -2011,11 +2015,12 @@ packages:
         # GHC 8 - dawg-ord
 
     "Amit Levy <amit@amitlevy.com> @alevy":
-        - postgresql-orm
+        # https://github.com/alevy/postgresql-orm/issues/17
+        # GHC 8 - postgresql-orm
         - simple
         - simple-templates
         - simple-session
-        - simple-postgresql-orm
+        # GHC 8 - simple-postgresql-orm
 
     "Sergey Astanin <s.astanin@gmail.com> @astanin":
         []
@@ -2144,7 +2149,9 @@ packages:
         # GHC 8 - ghc-imported-from
 
     "Fraser Tweedale <frase@frase.id.au> @frasertweedale":
-        - jose
+        []
+        # https://github.com/frasertweedale/hs-jose/issues/14
+        # GHC 8 - jose
 
     "Yutaka Nishimura <ytk.nishimura@gmail.com> @ynishi":
         - atndapi
@@ -2811,6 +2818,12 @@ expected-test-failures:
 
     # https://github.com/peti/language-nix/issues/2
     - language-nix
+
+    # https://github.com/thoughtpolice/hs-ed25519/issues/15
+    - ed25519
+
+    # https://github.com/twanvl/multiset/issues/18
+    - multiset
 # end of expected-test-failures
 
 # Benchmarks which are known not to build. Note that, currently we do not run
@@ -2894,6 +2907,9 @@ expected-haddock-failures:
 
     # https://github.com/iand675/metrics/issues/5
     - metrics
+
+    # https://github.com/haskell/haddock/issues/516
+    - haddock-api
 # end of expected-haddock-failures