diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9a051619..fe05826d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -908,25 +908,42 @@ packages:
         - aeson-extra
         - binary-orphans
         - binary-tagged
-        - bower-json
-        - boxes
         - edit-distance
         - lattices
-        - monad-time
-        - pattern-arrows
         - postgresql-simple-url
-        - purescript
         - regex-applicative-text
         - servant-yaml
         - spdx
+        - waitra
+
+        # Not a maintainer
+        - monad-time
         - these
+
+        # Regex packages by Chris Kuklewicz
+        - regex-base
+        - regex-compat
+        - regex-dfa
+        - regex-parsec
+        - regex-pcre
+        - regex-posix
+        - regex-tdfa
+        - regex-tdfa-utf8
+        - regex-tre
+
+        # Purescript
+        - bower-json
+        - boxes
+        - pattern-arrows
+        - purescript
+
+        # Universe
         - universe
         - universe-base
         - universe-instances-base
         - universe-instances-extended
         - universe-instances-trans
         - universe-reverse-instances
-        - waitra
 
     "Adam C. Foltzer acfoltzer@galois.com @acfoltzer":
         - cryptol