diff --git a/src/profile b/src/profile
index 2096ec8..9860f67 100644
--- a/src/profile
+++ b/src/profile
@@ -4,6 +4,9 @@
 # Instead, add custom environment variables to env.d/99-custom and
 # custom scripting to profile.d/99-custom
 
+# Source the base /etc/profile file
+source /etc/profile
+
 # Find system configuration directory
 SYSCONFDIR="$(crew const CREW_PREFIX | sed -e 's:CREW_PREFIX=::g')/etc"
 
@@ -13,6 +16,11 @@ set +h
 # Load the environment
 for i in "${SYSCONFDIR}"/env.d/*; do source "${i}"; done
 
+# Load the profile
+if [ -d ${SYSCONFDIR}/profile.d ]; then
+  for i in "${SYSCONFDIR}"/profile.d/*.sh; do source "${i}"; done
+fi
+
 # Load the bash directory
 if [ ! -z "${BASH}" ]; then
   for i in "${SYSCONFDIR}"/bash.d/*; do source "${i}"; done
@@ -20,5 +28,5 @@ fi
 
 # Load the zsh directory
 if [ ! -z "${ZSH_NAME}" ]; then
-  for i in "${SYSCONFDIR}"/bash.d/*; do source "${i}"; done
+  for i in "${SYSCONFDIR}"/zsh.d/*; do source "${i}"; done
 fi