diff --git a/Dockerfile b/Dockerfile
index 02aa0f0d7..0a953ddc0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,8 +22,8 @@ WORKDIR /opt/letsencrypt
 # directories in its path.
 
 
-COPY bootstrap/ubuntu.sh /opt/letsencrypt/src/ubuntu.sh
-RUN /opt/letsencrypt/src/ubuntu.sh && \
+COPY letsencrypt_auto/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto
+RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
            /tmp/* \
diff --git a/Dockerfile-dev b/Dockerfile-dev
index 838b60e8b..23b6a0a88 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -22,8 +22,8 @@ WORKDIR /opt/letsencrypt
 
 # TODO: Install non-default Python versions for tox.
 # TODO: Install Apache/Nginx for plugin development.
-COPY bootstrap/ubuntu.sh /opt/letsencrypt/src/ubuntu.sh
-RUN /opt/letsencrypt/src/ubuntu.sh && \
+COPY letsencrypt_auto/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto
+RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
            /tmp/* \
diff --git a/Vagrantfile b/Vagrantfile
index a2759440c..4a603c2ce 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,7 +7,7 @@ VAGRANTFILE_API_VERSION = "2"
 # Setup instructions from docs/contributing.rst
 $ubuntu_setup_script = <<SETUP_SCRIPT
 cd /vagrant
-./bootstrap/install-deps.sh
+./letsencrypt-auto/letsencrypt-auto --os-packages-only
 ./bootstrap/dev/venv.sh
 SETUP_SCRIPT
 
diff --git a/bootstrap/_arch_common.sh b/bootstrap/_arch_common.sh
deleted file mode 100755
index 47361c6c4..000000000
--- a/bootstrap/_arch_common.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Tested with:
-#   - ArchLinux (x86_64)
-#
-# "python-virtualenv" is Python3, but "python2-virtualenv" provides
-# only "virtualenv2" binary, not "virtualenv" necessary in
-# ./bootstrap/dev/_common_venv.sh
-
-deps="
-  git
-  python2
-  python-virtualenv
-  gcc
-  dialog
-  augeas
-  openssl
-  libffi
-  ca-certificates
-  pkg-config
-"
-
-missing=$("$SUDO" pacman -T $deps)
-
-if [ "$missing" ]; then
-  "$SUDO" pacman -S --needed $missing
-fi
diff --git a/bootstrap/_deb_common.sh b/bootstrap/_deb_common.sh
deleted file mode 100755
index 4c6b91a33..000000000
--- a/bootstrap/_deb_common.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# Current version tested with:
-#
-# - Ubuntu
-#     - 14.04 (x64)
-#     - 15.04 (x64)
-# - Debian
-#     - 7.9 "wheezy" (x64)
-#     - sid (2015-10-21) (x64)
-
-# Past versions tested with:
-#
-# - Debian 8.0 "jessie" (x64)
-# - Raspbian 7.8 (armhf)
-
-# Believed not to work:
-#
-# - Debian 6.0.10 "squeeze" (x64)
-
-apt-get update
-
-# virtualenv binary can be found in different packages depending on
-# distro version (#346)
-
-virtualenv=
-if apt-cache show virtualenv > /dev/null ; then
-  virtualenv="virtualenv"
-fi
-
-if apt-cache show python-virtualenv > /dev/null ; then
-  virtualenv="$virtualenv python-virtualenv"
-fi
-
-apt-get install -y --no-install-recommends \
-  git \
-  python \
-  python-dev \
-  $virtualenv \
-  gcc \
-  dialog \
-  libaugeas0 \
-  libssl-dev \
-  libffi-dev \
-  ca-certificates \
-
-if ! command -v virtualenv > /dev/null ; then
-  echo Failed to install a working \"virtualenv\" command, exiting
-  exit 1
-fi
diff --git a/bootstrap/_gentoo_common.sh b/bootstrap/_gentoo_common.sh
deleted file mode 100755
index 164312c86..000000000
--- a/bootstrap/_gentoo_common.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-PACKAGES="dev-vcs/git
-  dev-lang/python:2.7
-  dev-python/virtualenv
-  dev-util/dialog
-  app-admin/augeas
-  dev-libs/openssl
-  dev-libs/libffi
-  app-misc/ca-certificates
-  virtual/pkgconfig"
-
-case "$PACKAGE_MANAGER" in
-  (paludis)
-    "$SUDO" cave resolve --keep-targets if-possible $PACKAGES -x
-    ;;
-  (pkgcore)
-    "$SUDO" pmerge --noreplace $PACKAGES
-    ;;
-  (portage|*)
-    "$SUDO" emerge --noreplace $PACKAGES
-    ;;
-esac
diff --git a/bootstrap/_rpm_common.sh b/bootstrap/_rpm_common.sh
deleted file mode 100755
index b975da444..000000000
--- a/bootstrap/_rpm_common.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# Tested with:
-#   - Fedora 22, 23 (x64)
-#   - Centos 7 (x64: onD igitalOcean droplet)
-
-if type dnf 2>/dev/null
-then
-  tool=dnf
-elif type yum 2>/dev/null
-then
-  tool=yum
-
-else
-  echo "Neither yum nor dnf found. Aborting bootstrap!"
-  exit 1
-fi
-
-# Some distros and older versions of current distros use a "python27"
-# instead of "python" naming convention. Try both conventions.
-if ! $tool install -y \
-       python \
-       python-devel \
-       python-virtualenv
-then
-  if ! $tool install -y \
-         python27 \
-         python27-devel \
-         python27-virtualenv
-  then
-    echo "Could not install Python dependencies. Aborting bootstrap!"
-    exit 1
-  fi
-fi
-
-# "git-core" seems to be an alias for "git" in CentOS 7 (yum search fails)
-if ! $tool install -y \
-       git-core \
-       gcc \
-       dialog \
-       augeas-libs \
-       openssl-devel \
-       libffi-devel \
-       redhat-rpm-config \
-       ca-certificates
-then
-    echo "Could not install additional dependencies. Aborting bootstrap!"
-    exit 1
-fi
diff --git a/bootstrap/_suse_common.sh b/bootstrap/_suse_common.sh
deleted file mode 100755
index 46f9d693b..000000000
--- a/bootstrap/_suse_common.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# SLE12 don't have python-virtualenv
-
-zypper -nq in -l git-core \
-  python \
-  python-devel \
-  python-virtualenv \
-  gcc \
-  dialog \
-  augeas-lenses \
-  libopenssl-devel \
-  libffi-devel \
-  ca-certificates \
diff --git a/bootstrap/archlinux.sh b/bootstrap/archlinux.sh
deleted file mode 120000
index c5c9479f7..000000000
--- a/bootstrap/archlinux.sh
+++ /dev/null
@@ -1 +0,0 @@
-_arch_common.sh
\ No newline at end of file
diff --git a/bootstrap/centos.sh b/bootstrap/centos.sh
deleted file mode 120000
index a0db46d70..000000000
--- a/bootstrap/centos.sh
+++ /dev/null
@@ -1 +0,0 @@
-_rpm_common.sh
\ No newline at end of file
diff --git a/bootstrap/debian.sh b/bootstrap/debian.sh
deleted file mode 120000
index 068a039cb..000000000
--- a/bootstrap/debian.sh
+++ /dev/null
@@ -1 +0,0 @@
-_deb_common.sh
\ No newline at end of file
diff --git a/bootstrap/fedora.sh b/bootstrap/fedora.sh
deleted file mode 120000
index a0db46d70..000000000
--- a/bootstrap/fedora.sh
+++ /dev/null
@@ -1 +0,0 @@
-_rpm_common.sh
\ No newline at end of file
diff --git a/bootstrap/freebsd.sh b/bootstrap/freebsd.sh
deleted file mode 100755
index d16b1a5bb..000000000
--- a/bootstrap/freebsd.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -xe
-
-"$SUDO" pkg install -Ay \
-  git \
-  python \
-  py27-virtualenv \
-  augeas \
-  libffi \
diff --git a/bootstrap/gentoo.sh b/bootstrap/gentoo.sh
deleted file mode 120000
index 125d6a592..000000000
--- a/bootstrap/gentoo.sh
+++ /dev/null
@@ -1 +0,0 @@
-_gentoo_common.sh
\ No newline at end of file
diff --git a/bootstrap/install-deps.sh b/bootstrap/install-deps.sh
deleted file mode 100755
index e907e7035..000000000
--- a/bootstrap/install-deps.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-#
-# Install OS dependencies.  In the glorious future, letsencrypt-auto will
-# source this...
-
-if test "`id -u`" -ne "0" ; then
-  SUDO=sudo
-else
-  SUDO=
-fi
-
-BOOTSTRAP=`dirname $0`
-if [ ! -f $BOOTSTRAP/debian.sh ] ; then
-  echo "Cannot find the letsencrypt bootstrap scripts in $BOOTSTRAP"
-  exit 1
-fi
-if [ -f /etc/debian_version ] ; then
-  echo "Bootstrapping dependencies for Debian-based OSes..."
-  $SUDO $BOOTSTRAP/_deb_common.sh
-elif [ -f /etc/arch-release ] ; then
-  echo "Bootstrapping dependencies for Archlinux..."
-  $SUDO $BOOTSTRAP/archlinux.sh
-elif [ -f /etc/redhat-release ] ; then
-  echo "Bootstrapping dependencies for RedHat-based OSes..."
-  $SUDO $BOOTSTRAP/_rpm_common.sh
-elif [ -f /etc/gentoo-release ] ; then
-  echo "Bootstrapping dependencies for Gentoo-based OSes..."
-  $SUDO $BOOTSTRAP/_gentoo_common.sh
-elif uname | grep -iq FreeBSD ; then
-  echo "Bootstrapping dependencies for FreeBSD..."
-  $SUDO $BOOTSTRAP/freebsd.sh
-elif `grep -qs openSUSE /etc/os-release` ; then
-  echo "Bootstrapping dependencies for openSUSE.."
-  $SUDO $BOOTSTRAP/suse.sh
-elif uname | grep -iq Darwin ; then
-  echo "Bootstrapping dependencies for Mac OS X..."
-  echo "WARNING: Mac support is very experimental at present..."
-  $BOOTSTRAP/mac.sh
-else
-  echo "Sorry, I don't know how to bootstrap Let's Encrypt on your operating system!"
-  echo
-  echo "You will need to bootstrap, configure virtualenv, and run a pip install manually"
-  echo "Please see https://letsencrypt.readthedocs.org/en/latest/contributing.html#prerequisites"
-  echo "for more info"
-  exit 1
-fi
diff --git a/bootstrap/mac.sh b/bootstrap/mac.sh
deleted file mode 100755
index 4d1fb8208..000000000
--- a/bootstrap/mac.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-if ! hash brew 2>/dev/null; then
-    echo "Homebrew Not Installed\nDownloading..."
-    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-fi
-
-brew install augeas
-brew install dialog
-
-if ! hash pip 2>/dev/null; then
-    echo "pip Not Installed\nInstalling python from Homebrew..."
-    brew install python
-fi
-
-if ! hash virtualenv 2>/dev/null; then
-    echo "virtualenv Not Installed\nInstalling with pip"
-    pip install virtualenv
-fi
diff --git a/bootstrap/manjaro.sh b/bootstrap/manjaro.sh
deleted file mode 120000
index c5c9479f7..000000000
--- a/bootstrap/manjaro.sh
+++ /dev/null
@@ -1 +0,0 @@
-_arch_common.sh
\ No newline at end of file
diff --git a/bootstrap/suse.sh b/bootstrap/suse.sh
deleted file mode 120000
index fc4c1dee4..000000000
--- a/bootstrap/suse.sh
+++ /dev/null
@@ -1 +0,0 @@
-_suse_common.sh
\ No newline at end of file
diff --git a/bootstrap/ubuntu.sh b/bootstrap/ubuntu.sh
deleted file mode 120000
index 068a039cb..000000000
--- a/bootstrap/ubuntu.sh
+++ /dev/null
@@ -1 +0,0 @@
-_deb_common.sh
\ No newline at end of file
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 0fd7593ff..04303a7be 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -22,7 +22,7 @@ once:
 
    git clone https://github.com/letsencrypt/letsencrypt
    cd letsencrypt
-   ./bootstrap/install-deps.sh
+   ./letsencrypt-auto/letsencrypt-auto --os-packages-only
    ./bootstrap/dev/venv.sh
 
 Then in each shell where you're working on the client, do:
diff --git a/letsencrypt_auto/letsencrypt-auto.template b/letsencrypt_auto/letsencrypt-auto.template
index 99f0f25d8..f3fa542e2 100755
--- a/letsencrypt_auto/letsencrypt-auto.template
+++ b/letsencrypt_auto/letsencrypt-auto.template
@@ -49,6 +49,14 @@ DeterminePythonVersion() {
   fi
 }
 
+{{bootstrap_deb_common}}
+{{bootstrap_rpm_common}}
+{{bootstrap_suse_common}}
+{{bootstrap_arch_common}}
+{{bootstrap_gentoo_common}}
+{{bootstrap_free_bsd}}
+{{bootstrap_mac}}
+
 # Install required OS packages:
 Bootstrap() {
   if [ -f /etc/debian_version ] ; then
@@ -63,7 +71,7 @@ Bootstrap() {
   elif [ -f /etc/arch-release ] ; then
     if [ "$DEBUG" = 1 ] ; then
       echo "Bootstrapping dependencies for Archlinux..."
-      BootstrapArchLinux
+      BootstrapArchCommon
     else
       echo "Please use pacman to install letsencrypt packages:"
       echo "# pacman -S letsencrypt letsencrypt-apache"
@@ -73,7 +81,7 @@ Bootstrap() {
       exit 1
     fi
   elif [ -f /etc/manjaro-release ] ; then
-    ExperimentalBootstrap "Manjaro Linux" BootstrapManjaro
+    ExperimentalBootstrap "Manjaro Linux" BootstrapArchCommon
   elif [ -f /etc/gentoo-release ] ; then
     ExperimentalBootstrap "Gentoo" BootstrapGentooCommon
   elif uname | grep -iq FreeBSD ; then
@@ -172,7 +180,7 @@ elif [ "$1" != "--_skip-to-install" ]; then
     # There is no $ interpolation due to quotes on heredoc delimiters.
     set +e
     TEMP_DIR=`$PYTHON - << "UNLIKELY_EOF"
-{download_upgrade}
+{{download_upgrade}}
 UNLIKELY_EOF`
     DOWNLOAD_STATUS=$?
     set -e
@@ -197,11 +205,11 @@ else  # --_skip-to-install was passed.
   TEMP_DIR="$2"
   shift 2
   cat << "UNLIKELY_EOF" > $TEMP_DIR/letsencrypt-auto-requirements.txt
-{requirements}
+{{requirements}}
 UNLIKELY_EOF
 
   cat << "UNLIKELY_EOF" > $TEMP_DIR/peep.py
-{peep}
+{{peep}}
 UNLIKELY_EOF
 
   set +e
diff --git a/letsencrypt_auto/pieces/bootstrappers/arch_common.sh b/letsencrypt_auto/pieces/bootstrappers/arch_common.sh
new file mode 100755
index 000000000..ef881448e
--- /dev/null
+++ b/letsencrypt_auto/pieces/bootstrappers/arch_common.sh
@@ -0,0 +1,27 @@
+BootstrapArchCommon() {
+  # Tested with:
+  #   - ArchLinux (x86_64)
+  #
+  # "python-virtualenv" is Python3, but "python2-virtualenv" provides
+  # only "virtualenv2" binary, not "virtualenv" necessary in
+  # ./bootstrap/dev/_common_venv.sh
+
+  deps="
+    git
+    python2
+    python-virtualenv
+    gcc
+    dialog
+    augeas
+    openssl
+    libffi
+    ca-certificates
+    pkg-config
+  "
+
+  missing=$("$SUDO" pacman -T $deps)
+
+  if [ "$missing" ]; then
+    "$SUDO" pacman -S --needed $missing
+  fi
+}
\ No newline at end of file
diff --git a/letsencrypt_auto/pieces/bootstrappers/deb_common.sh b/letsencrypt_auto/pieces/bootstrappers/deb_common.sh
new file mode 100644
index 000000000..b699f3fea
--- /dev/null
+++ b/letsencrypt_auto/pieces/bootstrappers/deb_common.sh
@@ -0,0 +1,50 @@
+BootstrapDebCommon() {
+  # Current version tested with:
+  #
+  # - Ubuntu
+  #     - 14.04 (x64)
+  #     - 15.04 (x64)
+  # - Debian
+  #     - 7.9 "wheezy" (x64)
+  #     - sid (2015-10-21) (x64)
+
+  # Past versions tested with:
+  #
+  # - Debian 8.0 "jessie" (x64)
+  # - Raspbian 7.8 (armhf)
+
+  # Believed not to work:
+  #
+  # - Debian 6.0.10 "squeeze" (x64)
+
+  $SUDO apt-get update
+
+  # virtualenv binary can be found in different packages depending on
+  # distro version (#346)
+
+  virtualenv=
+  if apt-cache show virtualenv > /dev/null ; then
+    virtualenv="virtualenv"
+  fi
+
+  if apt-cache show python-virtualenv > /dev/null ; then
+    virtualenv="$virtualenv python-virtualenv"
+  fi
+
+  $SUDO apt-get install -y --no-install-recommends \
+    git \
+    python \
+    python-dev \
+    $virtualenv \
+    gcc \
+    dialog \
+    libaugeas0 \
+    libssl-dev \
+    libffi-dev \
+    ca-certificates \
+
+  if ! command -v virtualenv > /dev/null ; then
+    echo Failed to install a working \"virtualenv\" command, exiting
+    exit 1
+  fi
+}
diff --git a/letsencrypt_auto/pieces/bootstrappers/freebsd.sh b/letsencrypt_auto/pieces/bootstrappers/freebsd.sh
new file mode 100755
index 000000000..8c65c97c0
--- /dev/null
+++ b/letsencrypt_auto/pieces/bootstrappers/freebsd.sh
@@ -0,0 +1,8 @@
+BootstrapFreeBsd() {
+  "$SUDO" pkg install -Ay \
+    git \
+    python \
+    py27-virtualenv \
+    augeas \
+    libffi \
+}
\ No newline at end of file
diff --git a/letsencrypt_auto/pieces/bootstrappers/gentoo_common.sh b/letsencrypt_auto/pieces/bootstrappers/gentoo_common.sh
new file mode 100755
index 000000000..557ae2d5c
--- /dev/null
+++ b/letsencrypt_auto/pieces/bootstrappers/gentoo_common.sh
@@ -0,0 +1,23 @@
+BootstrapGentooCommon() {
+  PACKAGES="dev-vcs/git
+    dev-lang/python:2.7
+    dev-python/virtualenv
+    dev-util/dialog
+    app-admin/augeas
+    dev-libs/openssl
+    dev-libs/libffi
+    app-misc/ca-certificates
+    virtual/pkgconfig"
+
+  case "$PACKAGE_MANAGER" in
+    (paludis)
+      "$SUDO" cave resolve --keep-targets if-possible $PACKAGES -x
+      ;;
+    (pkgcore)
+      "$SUDO" pmerge --noreplace $PACKAGES
+      ;;
+    (portage|*)
+      "$SUDO" emerge --noreplace $PACKAGES
+      ;;
+  esac
+}
\ No newline at end of file
diff --git a/letsencrypt_auto/pieces/bootstrappers/mac.sh b/letsencrypt_auto/pieces/bootstrappers/mac.sh
new file mode 100755
index 000000000..16bcfe1cf
--- /dev/null
+++ b/letsencrypt_auto/pieces/bootstrappers/mac.sh
@@ -0,0 +1,19 @@
+BootstrapMac() {
+  if ! hash brew 2>/dev/null; then
+      echo "Homebrew Not Installed\nDownloading..."
+      ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  fi
+
+  brew install augeas
+  brew install dialog
+
+  if ! hash pip 2>/dev/null; then
+      echo "pip Not Installed\nInstalling python from Homebrew..."
+      brew install python
+  fi
+
+  if ! hash virtualenv 2>/dev/null; then
+      echo "virtualenv Not Installed\nInstalling with pip"
+      pip install virtualenv
+  fi
+}
\ No newline at end of file
diff --git a/letsencrypt_auto/pieces/bootstrappers/rpm_common.sh b/letsencrypt_auto/pieces/bootstrappers/rpm_common.sh
new file mode 100755
index 000000000..459bd1408
--- /dev/null
+++ b/letsencrypt_auto/pieces/bootstrappers/rpm_common.sh
@@ -0,0 +1,49 @@
+BootstrapRpmCommon() {
+  # Tested with:
+  #   - Fedora 22, 23 (x64)
+  #   - Centos 7 (x64: onD igitalOcean droplet)
+
+  if type dnf 2>/dev/null
+  then
+    tool=dnf
+  elif type yum 2>/dev/null
+  then
+    tool=yum
+
+  else
+    echo "Neither yum nor dnf found. Aborting bootstrap!"
+    exit 1
+  fi
+
+  # Some distros and older versions of current distros use a "python27"
+  # instead of "python" naming convention. Try both conventions.
+  if ! $SUDO $tool install -y \
+         python \
+         python-devel \
+         python-virtualenv
+  then
+    if ! $SUDO $tool install -y \
+           python27 \
+           python27-devel \
+           python27-virtualenv
+    then
+      echo "Could not install Python dependencies. Aborting bootstrap!"
+      exit 1
+    fi
+  fi
+
+  # "git-core" seems to be an alias for "git" in CentOS 7 (yum search fails)
+  if ! $SUDO $tool install -y \
+         git-core \
+         gcc \
+         dialog \
+         augeas-libs \
+         openssl-devel \
+         libffi-devel \
+         redhat-rpm-config \
+         ca-certificates
+  then
+      echo "Could not install additional dependencies. Aborting bootstrap!"
+      exit 1
+  fi
+}
\ No newline at end of file
diff --git a/letsencrypt_auto/pieces/bootstrappers/suse_common.sh b/letsencrypt_auto/pieces/bootstrappers/suse_common.sh
new file mode 100755
index 000000000..dff40dcf1
--- /dev/null
+++ b/letsencrypt_auto/pieces/bootstrappers/suse_common.sh
@@ -0,0 +1,14 @@
+BootstrapSuseCommon() {
+  # SLE12 don't have python-virtualenv
+
+  $SUDO zypper -nq in -l git-core \
+    python \
+    python-devel \
+    python-virtualenv \
+    gcc \
+    dialog \
+    augeas-lenses \
+    libopenssl-devel \
+    libffi-devel \
+    ca-certificates \
+}
\ No newline at end of file