diff --git a/build/pkgs/sage_conf/spkg-install b/build/pkgs/sage_conf/spkg-install
index e572d89f80d..a180fb36542 100755
--- a/build/pkgs/sage_conf/spkg-install
+++ b/build/pkgs/sage_conf/spkg-install
@@ -12,6 +12,9 @@ fi
 cd src
 if [ "$SAGE_EDITABLE" = yes ]; then
     sdh_pip_editable_install .
+    if [ "$SAGE_WHEELS" = yes ]; then
+        sdh_setup_bdist_wheel && sdh_store_wheel .
+    fi
 else
     sdh_pip_install .
 fi
diff --git a/build/pkgs/sage_docbuild/spkg-install b/build/pkgs/sage_docbuild/spkg-install
index 1bb66bc4a07..cce58b40e22 100755
--- a/build/pkgs/sage_docbuild/spkg-install
+++ b/build/pkgs/sage_docbuild/spkg-install
@@ -12,6 +12,9 @@ fi
 cd src
 if [ "$SAGE_EDITABLE" = yes ]; then
     sdh_pip_editable_install .
+    if [ "$SAGE_WHEELS" = yes ]; then
+        sdh_setup_bdist_wheel && sdh_store_wheel .
+    fi
 else
     sdh_pip_install .
 fi
diff --git a/build/pkgs/sage_setup/spkg-install b/build/pkgs/sage_setup/spkg-install
index 1bb66bc4a07..cce58b40e22 100755
--- a/build/pkgs/sage_setup/spkg-install
+++ b/build/pkgs/sage_setup/spkg-install
@@ -12,6 +12,9 @@ fi
 cd src
 if [ "$SAGE_EDITABLE" = yes ]; then
     sdh_pip_editable_install .
+    if [ "$SAGE_WHEELS" = yes ]; then
+        sdh_setup_bdist_wheel && sdh_store_wheel .
+    fi
 else
     sdh_pip_install .
 fi
diff --git a/build/pkgs/sage_sws2rst/spkg-install b/build/pkgs/sage_sws2rst/spkg-install
index 12d0d16dff1..47ef9ee6cbf 100755
--- a/build/pkgs/sage_sws2rst/spkg-install
+++ b/build/pkgs/sage_sws2rst/spkg-install
@@ -3,16 +3,21 @@
 # For type=script packages, the build rule in build/make/Makefile sources
 # sage-env but not sage-dist-helpers.
 lib="$SAGE_ROOT/build/bin/sage-dist-helpers"
-. "$lib"
+source "$lib"
 if [ $? -ne 0 ]; then
     echo >&2 "Error: failed to source $lib"
     echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?"
     exit 1
 fi
-set -e
-# We build the wheel directly with "setup.py bdist_wheel", not with "pip wheel",
-# because pip does not handle our symlinks correctly.
-(cd src && sdh_setup_bdist_wheel && sdh_store_and_pip_install_wheel .)
+cd src
+if [ "$SAGE_EDITABLE" = yes ]; then
+    sdh_pip_editable_install .
+    if [ "$SAGE_WHEELS" = yes ]; then
+        sdh_setup_bdist_wheel && sdh_store_wheel .
+    fi
+else
+    sdh_pip_install .
+fi
 # For type=script packages, spkg-check is not run
 case "$SAGE_CHECK" in
     yes)