diff --git a/Rakefile b/Rakefile
index 3b92ac1a..f25cfd7f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+#
+require "bundler/gem_tasks"
 
 namespace :style do
   begin
@@ -52,3 +54,4 @@ namespace :style do
     puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
   end
 end
+
diff --git a/habitat/plan.sh b/habitat/plan.sh
index 47d460cd..774cc0a9 100644
--- a/habitat/plan.sh
+++ b/habitat/plan.sh
@@ -1,63 +1,121 @@
-pkg_name=chef-cli
-pkg_origin=chef
-ruby_pkg="core/ruby31"
-pkg_deps=(${ruby_pkg} core/coreutils)
+_chef_client_ruby="core/ruby31"
+pkg_name="chef-cli"
+pkg_origin="sanghinitin"
+pkg_maintainer="The Chef Maintainers <humans@chef.io>"
+pkg_description="The Chef CLI"
+pkg_license=('Apache-2.0')
+pkg_bin_dirs=(
+  bin
+  vendor/bin
+)
 pkg_build_deps=(
-    core/make
-    core/sed
-    core/gcc
-    core/libarchive
-    )
-pkg_bin_dirs=(bin)
-do_setup_environment() {
-  build_line 'Setting GEM_HOME="$pkg_prefix/lib"'
-  export GEM_HOME="$pkg_prefix/lib"
-
-  build_line "Setting GEM_PATH=$GEM_HOME"
-  export GEM_PATH="$GEM_HOME"
-}
+  core/make
+  core/gcc
+  core/git
+      core/libarchive
+)
+pkg_deps=(
+  $_chef_client_ruby
+  core/coreutils
+)
+pkg_svc_user=root
 
 pkg_version() {
-  cat "$SRC_PATH/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
 }
-do_unpack() {
-  mkdir -pv "$HAB_CACHE_SRC_PATH/$pkg_dirname"
-  cp -RT "$PLAN_CONTEXT"/.. "$HAB_CACHE_SRC_PATH/$pkg_dirname/"
+
+do_setup_environment() {
+  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"
 }
+
+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
+}
+
 do_build() {
-    pushd "$HAB_CACHE_SRC_PATH/$pkg_dirname/"
-        gem build chef-cli.gemspec
-    popd
+  ( cd "$CACHE_PATH" || exit_with "unable to enter hab-cache directory" 1
+    build_line "Installing gem dependencies ..."
+    bundle install --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 appbundler
+  )
 }
+
 do_install() {
-    pushd "$HAB_CACHE_SRC_PATH/$pkg_dirname/"
-        gem install chef-cli-*.gem --no-document
-    popd
-    wrap_ruby_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 chef-cli; do
+      build_line "** generating binstubs for $gem with precise version pins"
+      appbundler $CACHE_PATH $pkg_prefix/bin $gem
+    done
+  )
 }
-wrap_ruby_bin() {
-  local bin="$pkg_prefix/bin/$pkg_name"
-  local real_bin="$GEM_HOME/gems/chef-cli-${pkg_version}/bin/chef-cli"
-  build_line "Adding wrapper $bin to $real_bin"
-  cat <<EOF > "$bin"
-#!$(pkg_path_for core/bash)/bin/bash
-set -e
 
-# Set binary path that allows InSpec to use non-Hab pkg binaries
-export PATH="/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:\$PATH"
+do_after() {
+  build_line "Trimming the fat ..."
 
-# Set Ruby paths defined from 'do_setup_environment()'
-export GEM_HOME="$GEM_HOME"
-export GEM_PATH="$GEM_PATH"
+  # We don't need the cache of downloaded .gem files ...
+  rm -rf "$pkg_prefix/vendor/cache"
 
-exec $(pkg_path_for core/ruby31)/bin/ruby $real_bin \$@
-EOF
-  chmod -v 755 "$bin"
+  # 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 "chef-cli-${pkg_version}" \
+      | while read spec_dir; do rm -rf "$spec_dir"; done
 }
 
+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
+}
 
 do_strip() {
   return 0