diff --git a/pyenv.d/rehash/conda.bash b/pyenv.d/rehash/conda.bash
index 9b22dfb0..6febe61b 100644
--- a/pyenv.d/rehash/conda.bash
+++ b/pyenv.d/rehash/conda.bash
@@ -12,11 +12,13 @@ conda_exists() {
 }
 
 shims=()
-for shim in $(cat "${BASH_SOURCE%/*}/conda.txt"); do
-  if [ -n "${shim%%#*}" ]; then
+shopt -s nullglob
+for shim in $(cat "${BASH_SOURCE%/*}/conda.d/"*".list" | sort | uniq | sed -e 's/#.*$//' | sed -e '/^[[:space:]]*$/d'); do
+  if [ -n "${shim##*/}" ]; then
     shims[${#shims[*]}]="${shim})return 0;;"
   fi
 done
+shopt -u nullglob
 eval "conda_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}"
 
 # override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`
diff --git a/pyenv.d/rehash/conda.d/.gitignore b/pyenv.d/rehash/conda.d/.gitignore
new file mode 100644
index 00000000..655d89c2
--- /dev/null
+++ b/pyenv.d/rehash/conda.d/.gitignore
@@ -0,0 +1,3 @@
+*
+!/.gitignore
+!/default.list
diff --git a/pyenv.d/rehash/conda.txt b/pyenv.d/rehash/conda.d/default.list
similarity index 100%
rename from pyenv.d/rehash/conda.txt
rename to pyenv.d/rehash/conda.d/default.list
diff --git a/pyenv.d/rehash/source.bash b/pyenv.d/rehash/source.bash
index c4f73da8..f9e02ee3 100644
--- a/pyenv.d/rehash/source.bash
+++ b/pyenv.d/rehash/source.bash
@@ -1,11 +1,13 @@
 PROTOTYPE_SOURCE_SHIM_PATH="${SHIM_PATH}/.pyenv-source-shim"
 
 shims=()
-for shim in $(cat "${BASH_SOURCE%/*}/source.txt"); do
-  if [ -n "${shim%%#*}" ]; then
+shopt -s nullglob
+for shim in $(cat "${BASH_SOURCE%/*}/source.d/"*".list" | sort | uniq | sed -e 's/#.*$//' | sed -e '/^[[:space:]]*$/d'); do
+  if [ -n "${shim##*/}" ]; then
     shims[${#shims[*]}]="${shim})return 0;;"
   fi
 done
+shopt -u nullglob
 eval "source_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}"
 
 cat > "${PROTOTYPE_SOURCE_SHIM_PATH}" <<SH
diff --git a/pyenv.d/rehash/source.d/.gitignore b/pyenv.d/rehash/source.d/.gitignore
new file mode 100644
index 00000000..655d89c2
--- /dev/null
+++ b/pyenv.d/rehash/source.d/.gitignore
@@ -0,0 +1,3 @@
+*
+!/.gitignore
+!/default.list
diff --git a/pyenv.d/rehash/source.d/default.list b/pyenv.d/rehash/source.d/default.list
new file mode 100644
index 00000000..1964bb78
--- /dev/null
+++ b/pyenv.d/rehash/source.d/default.list
@@ -0,0 +1,6 @@
+# virtualenv
+activate
+activate.csh
+activate.fish
+# gettext (#688)
+gettext.sh
diff --git a/pyenv.d/rehash/source.txt b/pyenv.d/rehash/source.txt
deleted file mode 100644
index 9453f9fc..00000000
--- a/pyenv.d/rehash/source.txt
+++ /dev/null
@@ -1 +0,0 @@
-gettext.sh