diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init
index 080f54b..db15aa3 100755
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -9,6 +9,26 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
+resolve_link() {
+  $(type -p greadlink readlink | head -1) "$1"
+}
+
+abs_dirname() {
+  local cwd="$(pwd)"
+  local path="$1"
+
+  while [ -n "$path" ]; do
+    cd "${path%/*}"
+    local name="${path##*/}"
+    path="$(resolve_link "$name" || true)"
+  done
+
+  pwd
+  cd "$cwd"
+}
+
+PYENV_VIRTUALENV_INSTALL_PREFIX="$(dirname "$(abs_dirname "$0")")"
+
 print=""
 for args in "$@"
 do
@@ -65,10 +85,16 @@ fi
 
 case "$shell" in
 fish )
-  echo "setenv PYENV_VIRTUALENV_INIT 1;"
+  cat <<EOS
+setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
+setenv PYENV_VIRTUALENV_INIT 1;
+EOS
   ;;
 * )
-  echo "export PYENV_VIRTUALENV_INIT=1;"
+  cat <<EOS
+export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:${PATH}";
+export PYENV_VIRTUALENV_INIT=1;
+EOS
   ;;
 esac
 
diff --git a/install.sh b/install.sh
index 1608daf..c5bd24a 100755
--- a/install.sh
+++ b/install.sh
@@ -12,7 +12,10 @@ if [ -z "${PREFIX}" ]; then
 fi
 
 BIN_PATH="${PREFIX}/bin"
+SHIMS_PATH="${PREFIX}/shims"
 
 mkdir -p "$BIN_PATH"
+mkdir -p "$SHIMS_PATH"
 
 install -p bin/* "$BIN_PATH"
+install -p shims/* "$SHIMS_PATH"
diff --git a/shims/activate b/shims/activate
new file mode 100755
index 0000000..4cc5d45
--- /dev/null
+++ b/shims/activate
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+if [[ "$0" != "${BASH_SOURCE}" ]]; then
+  eval "$(pyenv sh-activate --verbose "$@" || true)"
+else
+  echo "pyenv-virtualenv: activate must be sourced. Run 'source activate envname' instead of 'activate envname'" 1>&2
+  false
+fi
diff --git a/shims/deactivate b/shims/deactivate
new file mode 100755
index 0000000..3a39302
--- /dev/null
+++ b/shims/deactivate
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+if [[ "$0" != "${BASH_SOURCE}" ]]; then
+  eval "$(pyenv sh-deactivate --verbose "$@" || true)"
+else
+  echo "pyenv-virtualenv: deactivate must be sourced. Run 'source deactivate' instead of 'deactivate'" 1>&2
+  false
+fi
diff --git a/test/init.bats b/test/init.bats
index b280fdb..0cd7e09 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -46,9 +46,11 @@ load test_helper
 }
 
 @test "outputs bash-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
   run pyenv-virtualenv-init - bash
   assert_success
   assert_output <<EOS
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?
@@ -80,9 +82,11 @@ EOS
 }
 
 @test "outputs fish-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
   run pyenv-virtualenv-init - fish
   assert_success
   assert_output <<EOS
+setenv PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
 setenv PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
@@ -112,9 +116,11 @@ EOS
 }
 
 @test "outputs zsh-specific syntax" {
+  export PYENV_VIRTUALENV_ROOT="${TMP}/pyenv/plugins/pyenv-virtualenv"
   run pyenv-virtualenv-init - zsh
   assert_success
   assert_output <<EOS
+export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:${PATH}";
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   local ret=\$?