diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 5dbd94563..1f46d6d76 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -20,6 +20,8 @@ To add your package you can edit [`build-constraints.yaml`](https://github.com/f
         - package2
         - package3
 
+(If you are adding yourself for the first time, you can yourself anywhere under the `packages:` section, it does not have to be at the end: this actually helps to avoid merge conflicts between new contributions.)
+
 Any dependencies of your packages that are not already part of
 stackage also need to be added explicitly (When this happens you will
 see `not present` errors in the CI log). As mentioned above: If you
diff --git a/build-constraints.yaml b/build-constraints.yaml
index e66908719..ff10c4558 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -5254,6 +5254,15 @@ packages:
     "Ian Davidson <bontaq@gmail.com> @bontaq":
         - purview
 
+    "Logan McGrath <logan.mcgrath@thisfieldwas.green> @keywordsalad":
+        - hakyllbars
+
+    "David Sánchez <davidslt+stackage@pm.me> @DavSanchez":
+        - richenv
+
+    "Zac Slade <krakrjak@gmail.com> @krakrjak":
+        - fits-parse
+
     "Grandfathered dependencies":
         - BiobaseNewick
         - Boolean
@@ -7192,7 +7201,6 @@ packages:
         - language-python < 0 # tried language-python-0.5.8, but its *library* requires transformers >=0.3 && < 0.6 and the snapshot contains transformers-0.6.1.0
         - language-thrift < 0 # tried language-thrift-0.12.0.1, but its *library* requires ansi-wl-pprint ==0.6.* and the snapshot contains ansi-wl-pprint-1.0.2
         - large-hashable < 0 # tried large-hashable-0.1.0.4, but its *library* requires template-haskell < 2.15 and the snapshot contains template-haskell-2.20.0.0
-        - learn-physics < 0 # tried learn-physics-0.6.5, but its *library* requires the disabled package: spatial-math
         - lens-accelerate < 0 # tried lens-accelerate-0.3.0.0, but its *library* requires lens ==4.* and the snapshot contains lens-5.2.3
         - lens-datetime < 0 # tried lens-datetime-0.3, but its *library* requires lens >=3 && < 5 and the snapshot contains lens-5.2.3
         - lens-family-th < 0 # tried lens-family-th-0.5.2.1, but its *library* requires template-haskell >=2.11 && < 2.19 and the snapshot contains template-haskell-2.20.0.0
@@ -8289,6 +8297,8 @@ packages:
         # https://github.com/commercialhaskell/stackage/issues/7124
         - mpi-hs < 0.7.3
 
+        # https://github.com/commercialhaskell/stackage/issues/7129
+        - lpeg < 1.1
     # end of Stackage upper bounds
 # end of packages
 
@@ -9172,7 +9182,6 @@ expected-test-failures:
     - character-cases # 0.1.0.6 https://github.com/aiya000/hs-character-cases/issues/3
     - codec-beam # 0.2.0 posix_spawnp: does not exist
     - colonnade # 1.2.0.2 https://github.com/andrewthad/colonnade/issues/31
-    - context-wai-middleware # 0.2.0.1 https://github.com/jship/context/issues/3
     - control-dsl # 0.2.1.3
     - crypt-sha512 # 0 Use -p '/crypt.$6$rounds=10$roundstoolow/' to rerun this test only.
     - curl-runnings # 0.17.0