diff --git a/release/RELEASE-NOTES.md b/release/RELEASE-NOTES.md
index 9d40148752..85d73612f2 100644
--- a/release/RELEASE-NOTES.md
+++ b/release/RELEASE-NOTES.md
@@ -7,7 +7,7 @@
 
 If you want to jump straight in, here are two important links:
 
-* With pip you can use the constraints file at [https://dist.plone.org/release/6.1.0b1/constraints.txt](https://dist.plone.org/release/6.1.0b1/constraints.txt), plus optionally [`constraints-extra.txt`](https://dist.plone.org/release/6.1.0b1/constraints-extra.txt) and [`constraints-ecosystem.txt`](https://dist.plone.org/release/6.1.0b1/constraints-ecosystem.txt).  Note: in 6.0 we did not have these last two files.  This may still change.
+* With pip you can use the constraints file at [https://dist.plone.org/release/6.1.0b1/constraints.txt](https://dist.plone.org/release/6.1.0b1/constraints.txt).
 * With Buildout you can use the versions file at [https://dist.plone.org/release/6.1.0b1/versions.cfg](https://dist.plone.org/release/6.1.0b1/versions.cfg), plus optionally [`versions-extra.cfg`](https://dist.plone.org/release/6.1.0b1/versions-extra.cfg) and [`versions-ecosystem.cfg`](https://dist.plone.org/release/6.1.0b1/versions-ecosystem.cfg).
 
 
diff --git a/release/checklist.md b/release/checklist.md
index 697d425f40..34cf63b726 100644
--- a/release/checklist.md
+++ b/release/checklist.md
@@ -30,6 +30,7 @@ See the [release schedule](https://plone.org/download/release-schedule).
   - [ ] Create a file `release/RELEASE-NOTES.md`. It may be enough to look through the changelog and copy interesting changes.
   - [ ] Get the `versions.cfg` file and any other versions files from coredev.
   - [ ] Create a `release/constraints.txt` file from this. The above tox command generates this.  Note: at some point I expect the constraints file to become leading, and we may need to generate a `versions.cfg` file instead.
+  - [ ] NEW.  Run `make install`.  This uses `mxdev` to install packages and generate some files.  Most importantly this generates `constraints-mxdev.txt`.  This contains *all* constraints, *and* makes sure no constraints are in there twice (provided that `mx.ini` is correct).  This is really the only constraints file that is needed and that is correct.  So I think I will only ship this one and call it `constraints.txt` on dist.plone.org.  This may need some more thought and updates in next releases.
   - [ ] Copy (`rsync`) these files to the pending release directory.  (We used to copy packages as well, but we do not do this for Plone 6 anymore.)
 - [ ] Write a post on community.plone.org announcing a pending/soft release. See [example](https://community.plone.org/t/plone-6-0-0b3-released/15728).  In the 6.1 alpha/beta/rc stage, we can skip pending releases and just make a real release.
 - [ ] Wait for feedback, preferably at most a few days.  As said, in the alpha/beta/rc stage, we can skip this.
diff --git a/release/tox.ini b/release/tox.ini
index 2f001facf3..028e1df570 100644
--- a/release/tox.ini
+++ b/release/tox.ini
@@ -20,8 +20,10 @@ commands =
     - cp -a {toxinidir}/../versions.cfg {toxinidir}/dist
     - cp -a {toxinidir}/../versions-ecosystem.cfg {toxinidir}/dist
     - cp -a {toxinidir}/../versions-extra.cfg {toxinidir}/dist
-    - cp -a {toxinidir}/../constraints.txt {toxinidir}/dist
-    - cp -a {toxinidir}/../constraints-ecosystem.txt {toxinidir}/dist
-    - cp -a {toxinidir}/../constraints-extra.txt {toxinidir}/dist
+#    - cp -a {toxinidir}/../constraints.txt {toxinidir}/dist
+#    - cp -a {toxinidir}/../constraints-ecosystem.txt {toxinidir}/dist
+#    - cp -a {toxinidir}/../constraints-extra.txt {toxinidir}/dist
+# This is really the best file:
+    - cp -a {toxinidir}/../constraints-mxdev.txt {toxinidir}/dist/constraints.txt
     - cp -a {toxinidir}/changelog.txt {toxinidir}/dist
     - cp -a {toxinidir}/RELEASE-NOTES.md {toxinidir}/dist