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..b4975a2 100755
--- a/install.sh
+++ b/install.sh
@@ -12,7 +12,9 @@ if [ -z "${PREFIX}" ]; then
 fi
 
 BIN_PATH="${PREFIX}/bin"
+SHIMS_PATH="${PREFIX}/shims"
 
 mkdir -p "$BIN_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