diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-python-packages.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-python-packages.sh
new file mode 100644
index 0000000..eb1f402
--- /dev/null
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-python-packages.sh
@@ -0,0 +1,8 @@
+PYTHON_PKGS="
+    awscli
+    virtualenv
+"
+
+for PKG in $PYTHON_PKGS ; do
+    /usr/local/bin/pip install --user $PKG
+done
diff --git a/custompkg/root/usr/local/bin/new-system-setup b/custompkg/root/usr/local/bin/new-system-setup
index cefaa47..029e183 100644
--- a/custompkg/root/usr/local/bin/new-system-setup
+++ b/custompkg/root/usr/local/bin/new-system-setup
@@ -33,8 +33,6 @@ sudo defaults write /Library/Preferences/com.apple.commerce AutoUpdateRestartReq
 sudo defaults write /Library/Preferences/com.apple.AppleFileServer guestAccess -bool false
 sudo defaults write /Library/Preferences/SystemConfiguration/com.apple.smb.server AllowGuestAccess -bool false
 
-# install three python modules systemwide, that's all
-# do the rest with pip install --user in homedir
+# install pip so users can
+#     pip install --user <pkg>
 sudo easy_install pip
-sudo /usr/local/bin/pip install virtualenv
-sudo /usr/local/bin/pip install awscli