diff --git a/bin/pyenv-sh-activate b/bin/pyenv-sh-activate
index 53452d4..3a8d96c 100755
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -231,3 +231,19 @@ EOS
     ;;
   esac
 fi
+
+# conda package anaconda/miniconda scripts (#173)
+if [ -x "${prefix}/bin/conda" ]; then
+  shopt -s nullglob
+  case "${shell}" in
+  fish )
+    : # conda doesn't support fish
+    ;;
+  * )
+    for script in "${prefix}/etc/conda/activate.d"/*.sh; do
+      echo ". \"${script}\";"
+    done
+    ;;
+  esac
+  shopt -u nullglob
+fi
diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index 134a8f2..c590333 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -58,6 +58,22 @@ if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then
   echo "pyenv-virtualenv: deactivate ${venv}" 1>&2
 fi
 
+# conda package anaconda/miniconda scripts (#173)
+if [ -x "${prefix}/bin/conda" ]; then
+  shopt -s nullglob
+  case "${shell}" in
+  fish )
+    : # conda doesn't support fish
+    ;;
+  * )
+    for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do
+      echo ". \"${script}\";"
+    done
+    ;;
+  esac
+  shopt -u nullglob
+fi
+
 if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then
   # shell version set in pyenv-sh-activate should be unset
   # https://github.com/yyuu/pyenv-virtualenv/issues/61