diff --git a/bin/pyenv-sh-activate b/bin/pyenv-sh-activate
index 2360346a..c3ffe79a 100755
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -237,7 +237,10 @@ if [ -x "${prefix}/bin/conda" ]; then
   shopt -s nullglob
   case "${shell}" in
   fish )
-    : # conda doesn't support fish
+    # conda 4.4 and above
+    for script in "${prefix}/etc/fish/conf.d"/*.fish; do
+      echo "source \"${script}\";"
+    done
     ;;
   * )
     CONDA_PREFIX="$prefix"
@@ -245,6 +248,10 @@ if [ -x "${prefix}/bin/conda" ]; then
     for script in "${prefix}/etc/conda/activate.d"/*.sh; do
       echo ". \"${script}\";"
     done
+    # conda 4.4 and above
+    for script in "${prefix}/etc/profile.d"/*.sh; do
+      echo ". \"${script}\";"
+    done
     ;;
   esac
   shopt -u nullglob