diff --git a/build/pkgs/gap/spkg-install.in b/build/pkgs/gap/spkg-install.in
index d2d249d6222..7d207a47a48 100644
--- a/build/pkgs/gap/spkg-install.in
+++ b/build/pkgs/gap/spkg-install.in
@@ -44,6 +44,15 @@ sdh_install \
     pkg/tomlib \
     "$GAP_ROOT"/pkg
 
+# Finally, install packagemanager for the people who reject both
+# sage's and their system's package managers. We have to create
+# the local bin directory first:
+#
+#   https://github.com/gap-packages/PackageManager/issues/105
+#
+mkdir -p "$SAGE_LOCAL/lib/gap/bin"
+sdh_install pkg/packagemanager "$GAP_ROOT"/pkg
+
 # TODO: This seems unnecessary--we are already installing all of doc/ to
 # GAP_ROOT, which is necessary for some functionality in GAP to work.  Do
 # we need this?  Maybe doc/gap could just be a symlink to gap/doc??
diff --git a/build/pkgs/gap_packages/spkg-install.in b/build/pkgs/gap_packages/spkg-install.in
index 740dc8452f7..7005cc3d322 100644
--- a/build/pkgs/gap_packages/spkg-install.in
+++ b/build/pkgs/gap_packages/spkg-install.in
@@ -33,9 +33,6 @@ PKG_DIR="$SAGE_LOCAL/lib/gap/pkg"
 PKG_SRC_DIR="$(pwd)/src/pkg"
 cd "$PKG_SRC_DIR"
 
-# The 'packagemanager' package expects this https://github.com/gap-packages/PackageManager/issues/105
-mkdir -p "$SAGE_LOCAL/lib/gap/bin"
-
 # directly install pure GAP packages
 #
 #    happrime - no longer distributed, partly merged in Hap,
@@ -61,7 +58,6 @@ sdh_install \
     liering \
     loops \
     mapclass \
-    packagemanager \
     polymaking \
     qpa \
     quagroup \