diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index a69e726cf..f76d9e877 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -4,7 +4,7 @@ $PSDefaultParameterValues['*:ErrorAction']='Stop'
 $pkg_name="berkshelf"
 $pkg_origin="core"
 $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")
-$pkg_revision="1"
+$pkg_revision="8.0.15"
 $pkg_maintainer="The Chef Maintainers <humans@chef.io>"
 
 $pkg_deps=@(
diff --git a/habitat/plan.sh b/habitat/plan.sh
index 0a20a9d0b..6d03893a3 100644
--- a/habitat/plan.sh
+++ b/habitat/plan.sh
@@ -1,75 +1,121 @@
+_chef_client_ruby="core/ruby31"
 pkg_name=berkshelf
 pkg_origin=core
-pkg_version="8.0.15"
 pkg_description="Manage Chef Infra cookbooks and cookbook dependencies"
 pkg_license=('Apache-2.0')
-pkg_deps=(
-  core/ruby31
-  core/bash
+pkg_bin_dirs=(
+  bin
+  vendor/bin
 )
 pkg_build_deps=(
-  core/gcc
   core/make
+  core/gcc
+  core/git
+)
+pkg_deps=(
+  $_chef_client_ruby
+  core/coreutils
 )
-pkg_bin_dirs=(bin)
+pkg_svc_user=root
+
+pkg_version() {
+  cat "${SRC_PATH}/VERSION"
+}
+
+do_before() {
+  do_default_before
+  update_pkg_version
+  # We must wait until we update the pkg_version to use the pkg_version
+  pkg_filename="${pkg_name}-${pkg_version}.tar.gz"
+}
+
+do_download() {
+  build_line "Locally creating archive of latest repository commit at ${HAB_CACHE_SRC_PATH}/${pkg_filename}"
+  # source is in this repo, so we're going to create an archive from the
+  # appropriate path within the repo and place the generated tarball in the
+  # location expected by do_unpack
+  ( cd "${SRC_PATH}" || exit_with "unable to enter hab-src directory" 1
+    git archive --prefix="${pkg_name}-${pkg_version}/" --output="${HAB_CACHE_SRC_PATH}/${pkg_filename}" HEAD
+  )
+}
+
+do_verify() {
+  build_line "Skipping checksum verification on the archive we just created."
+  return 0
+}
 
 # Setup environment variables for Ruby Gems
 do_setup_environment() {
-  build_line "Setting up GEM_HOME and GEM_PATH"
-  export GEM_HOME="$pkg_prefix/lib"
-  export GEM_PATH="$GEM_HOME"
+  push_runtime_env GEM_PATH "${pkg_prefix}/vendor"
+
+  set_runtime_env APPBUNDLER_ALLOW_RVM "true" # prevent appbundler from clearing out the carefully constructed runtime GEM_PATH
+  set_runtime_env LANG "en_US.UTF-8"
+  set_runtime_env LC_CTYPE "en_US.UTF-8"
 }
 
-# Unpack the source files into the cache directory
-do_unpack() {
-  local unpack_dir="$HAB_CACHE_SRC_PATH/$pkg_dirname"
-  build_line "Creating unpack directory: $unpack_dir"
-  mkdir -pv "$unpack_dir"
-  cp -RT "$PLAN_CONTEXT"/.. "$unpack_dir/"
+do_prepare() {
+  export GEM_HOME="${pkg_prefix}/vendor"
+  export CPPFLAGS="${CPPFLAGS} ${CFLAGS}"
+
+  ( cd "$CACHE_PATH"
+    bundle config --local jobs "$(nproc)"
+    bundle config --local without server docgen maintenance pry travis integration ci chefstyle
+    bundle config --local shebang "$(pkg_path_for "$_chef_client_ruby")/bin/ruby"
+    bundle config --local retry 5
+    bundle config --local silence_root_warning 1
+  )
+  
+  build_line "Setting link for /usr/bin/env to 'coreutils'"
+  if [ ! -f /usr/bin/env ]; then
+    ln -s "$(pkg_interpreter_for core/coreutils bin/env)" /usr/bin/env
+  fi
 }
 
 # Build the gem from the gemspec file
 do_build() {
-  build_line "Building the gem from the gemspec file"
-  pushd "$HAB_CACHE_SRC_PATH/$pkg_dirname" > /dev/null
-  gem build berkshelf.gemspec
-  popd > /dev/null
+  ( cd "$CACHE_PATH" || exit_with "unable to enter hab-cache directory" 1
+    build_line "Installing gem dependencies ..."
+    bundle install --without development --jobs=3 --retry=3
+    build_line "Installing gems from git repos properly ..."
+    build_line "Installing this project's gems ..."
+    bundle exec rake install:local
+    gem install chef-utils chef-config
+  )
 }
 
 # Install the built gem into the package directory
 do_install() {
-  build_line "Installing the gem"
-  pushd "$HAB_CACHE_SRC_PATH/$pkg_dirname" > /dev/null
-  gem install berkshelf-*.gem --no-document
-  popd > /dev/null
-
-  wrap_berkshelf_bin
+  ( cd "$pkg_prefix" || exit_with "unable to enter pkg prefix directory" 1
+    export BUNDLE_GEMFILE="${CACHE_PATH}/Gemfile"
+    build_line "** fixing binstub shebangs"
+    fix_interpreter "${pkg_prefix}/vendor/bin/*" "$_chef_client_ruby" bin/ruby
+    export BUNDLE_GEMFILE="${CACHE_PATH}/Gemfile"
+    for gem in berkshelf; do
+      build_line "** generating binstubs for $gem with precise version pins"
+      appbundler $CACHE_PATH $pkg_prefix/bin $gem
+    done
+  )
 }
 
-# Create a wrapper script to properly set paths and execute the berkshelf command
-wrap_berkshelf_bin() {
-  local bin="$pkg_prefix/bin/berks"
-  local real_bin="$GEM_HOME/gems/berkshelf-${pkg_version}/bin/berks"
-  build_line "Adding wrapper $bin to $real_bin"
-
-#   build_line "Creating wrapper script: $bin"
-  cat <<EOF > "$bin"
-#!$(pkg_path_for core/bash)/bin/bash
-set -e
+do_after() {
+  build_line "Trimming the fat ..."
 
-# Set the PATH for berkshelf to include necessary binaries
-export PATH="/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:\$PATH"
+  # We don't need the cache of downloaded .gem files ...
+  rm -rf "$pkg_prefix/vendor/cache"
 
-# Set Ruby paths defined from 'do_setup_environment()'
-export GEM_HOME="$GEM_HOME"
-export GEM_PATH="$GEM_PATH"
-
-# Execute the berkshelf binary
-exec $(pkg_path_for core/ruby31)/bin/ruby $real_bin "\$@"
-EOF
+  # We don't need the gem docs.
+  rm -rf "$pkg_prefix/vendor/doc"
+  # We don't need to ship the test suites for every gem dependency,
+  # only Chef's for package verification.
+  find "$pkg_prefix/vendor/gems" -name spec -type d | grep -v "berkshelf-${pkg_version}" \
+      | while read spec_dir; do rm -rf "$spec_dir"; done
+}
 
-  # Ensure the wrapper script is executable
-  chmod -v 755 "$bin"
+do_end() {
+  if [ "$(readlink /usr/bin/env)" = "$(pkg_interpreter_for core/coreutils bin/env)" ]; then
+    build_line "Removing the symlink we created for '/usr/bin/env'"
+    rm /usr/bin/env
+  fi
 }
 
 # No additional stripping needed