diff --git a/.bash_profile b/.bash_profile
index fc040ff..68026e2 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -9,11 +9,12 @@ fi
 PATH=$PATH:$HOME/.local/bin:$HOME/bin
 export PATH
 
-# Export environment variables found in ~/.env . This file should contain
-# environment variables that are either specific to a machine or can not be
-# included in the dotfiles repository for security or privacy reasons.
-if [ -f ~/.env ]; then
-  set -a
-  . ~/.env
-  set +a
-fi
+# Export environment variables found in ~/.environment.d/ . Adding files in a
+# directory makes it easier to supply environment variables that are either
+# specific to a machine or can not be included in the dotfiles repository for
+# security or privacy reasons.
+set -a
+for file in ~/.environment.d/*.env; do
+  . "$FILE"
+done
+set +a
diff --git a/.environment.d/.gitinclude b/.environment.d/.gitinclude
new file mode 100644
index 0000000..e69de29