diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
index e520fa17104..944af9a72b3 100644
--- a/.github/workflows/ci-conda.yml
+++ b/.github/workflows/ci-conda.yml
@@ -92,7 +92,7 @@ jobs:
         run: |
           # Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
           pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
-          pip install --no-build-isolation --no-deps -v -v -e ./src
+          pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
         env:
           SAGE_NUM_THREADS: 2
         
diff --git a/build/pkgs/setuptools/distros/conda.txt b/build/pkgs/setuptools/distros/conda.txt
index 2602d0f6344..49fe098d9e6 100644
--- a/build/pkgs/setuptools/distros/conda.txt
+++ b/build/pkgs/setuptools/distros/conda.txt
@@ -1,4 +1 @@
-# Set this bound until https://github.com/sagemath/sage/issues/34209 adds support for PEP660 editable builds
-# By setting this version bound, we avoid having to include the following in our installation instructions.
-#   export SETUPTOOLS_ENABLE_FEATURES=legacy-editable
-"setuptools<64"
+setuptools
diff --git a/build/pkgs/setuptools_wheel/distros b/build/pkgs/setuptools_wheel/distros
new file mode 120000
index 00000000000..b22be5c01a6
--- /dev/null
+++ b/build/pkgs/setuptools_wheel/distros
@@ -0,0 +1 @@
+../setuptools/distros
\ No newline at end of file
diff --git a/build/pkgs/setuptools_wheel/distros/repology.txt b/build/pkgs/setuptools_wheel/distros/repology.txt
deleted file mode 100644
index 845a263c318..00000000000
--- a/build/pkgs/setuptools_wheel/distros/repology.txt
+++ /dev/null
@@ -1 +0,0 @@
-python:setuptools
diff --git a/pkgs/sage-conf_conda/setup.py b/pkgs/sage-conf_conda/setup.py
index 9e8ac353f4f..96f163dfe5a 100644
--- a/pkgs/sage-conf_conda/setup.py
+++ b/pkgs/sage-conf_conda/setup.py
@@ -28,24 +28,21 @@ def run(self):
             raise SetupError('No conda environment is active. '
                              'See https://doc.sagemath.org/html/en/installation/conda.html on how to get started.')
 
-        if os.path.exists(os.path.join(SAGE_ROOT, 'config.status')):
-            print(f'Reusing configured SAGE_ROOT={SAGE_ROOT}')
-        else:
-            cmd = f"cd {SAGE_ROOT} && ./configure --enable-build-as-root --with-system-python3=force --disable-notebook --disable-sagelib --disable-sage_conf --disable-doc"
-            cmd += ' --with-python=$CONDA_PREFIX/bin/python --prefix="$CONDA_PREFIX"'
-            cmd += ' $(for pkg in $(PATH="build/bin:$PATH" build/bin/sage-package list :standard: --exclude rpy2 --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)'
-            print(f"Running {cmd}")
-            sys.stdout.flush()
-            if os.system(cmd) != 0:
-                if os.path.exists(os.path.join(SAGE_ROOT, 'config.status')):
-                    print("Warning: A configuration has been written, but the configure script has exited with an error. "
-                          "Carefully check any messages above before continuing.")
-                else:
-                    print(f"Error: The configure script has failed; this may be caused by missing build prerequisites.")
-                    sys.stdout.flush()
-                    PREREQ_SPKG = "_prereq bzip2 xz libffi"  # includes python3 SPKG_DEPCHECK packages
-                    os.system(f'cd {SAGE_ROOT} && export PACKAGES="$(build/bin/sage-get-system-packages conda {PREREQ_SPKG})" && [ -n "$PACKAGES" ] && echo "You can install the required build prerequisites using the following shell command" && echo "" && build/bin/sage-print-system-package-command conda --verbose --sudo install $PACKAGES && echo ""')
-                    raise SetupError("configure failed")
+        cmd = f"cd {SAGE_ROOT} && ./configure --enable-build-as-root --with-system-python3=force --disable-notebook --disable-sagelib --disable-sage_conf --disable-doc"
+        cmd += ' --with-python=$CONDA_PREFIX/bin/python --prefix="$CONDA_PREFIX"'
+        cmd += ' $(for pkg in $(PATH="build/bin:$PATH" build/bin/sage-package list :standard: --exclude rpy2 --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)'
+        print(f"Running {cmd}")
+        sys.stdout.flush()
+        if os.system(cmd) != 0:
+            if os.path.exists(os.path.join(SAGE_ROOT, 'config.status')):
+                print("Warning: A configuration has been written, but the configure script has exited with an error. "
+                      "Carefully check any messages above before continuing.")
+            else:
+                print(f"Error: The configure script has failed; this may be caused by missing build prerequisites.")
+                sys.stdout.flush()
+                PREREQ_SPKG = "_prereq bzip2 xz libffi"  # includes python3 SPKG_DEPCHECK packages
+                os.system(f'cd {SAGE_ROOT} && export PACKAGES="$(build/bin/sage-get-system-packages conda {PREREQ_SPKG})" && [ -n "$PACKAGES" ] && echo "You can install the required build prerequisites using the following shell command" && echo "" && build/bin/sage-print-system-package-command conda --verbose --sudo install $PACKAGES && echo ""')
+                raise SetupError("configure failed")
 
         # In this mode, we never run "make".
 
diff --git a/src/doc/en/installation/conda.rst b/src/doc/en/installation/conda.rst
index 14fe52ad2e2..9456deff2b0 100644
--- a/src/doc/en/installation/conda.rst
+++ b/src/doc/en/installation/conda.rst
@@ -136,8 +136,9 @@ Here we assume that you are using a git checkout.
     A different Python version can be selected by replacing ``3.11`` by ``3.9``
     or ``3.10`` in these commands.
 
-  - Install the build prerequisites and the Sage library::
+  - Bootstrap the source tree and install the build prerequisites and the Sage library::
 
+      $ ./bootstrap
       $ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda ./pkgs/sage-setup
       $ pip install --no-build-isolation --config-settings editable_mode=compat -v -v --editable ./src
 
@@ -160,7 +161,7 @@ suffices to restart Sage.
 
 After editing any Cython files, rebuild the Sage library using::
 
-  $ pip install --no-build-isolation -v -v --editable src
+  $ pip install --no-build-isolation --config-settings editable_mode=compat -v -v --editable src
 
 In order to update the conda environment later, you can run::