--- a/.zshrc
+++ b/.zshrc
@@ -1,22 +1,22 @@
 # Augie Fackler's zshrc file
 
-for file in $(ls $HOME/.zsh) ; do
-    source $HOME/.zsh/$file
+for file in $(ls $HOME/.shell.d/*.{,z}sh) ; do
+    source $file
 done
 
 # Login greeting ------------------
 
 if [ ! "$SHOWED_SCREEN_MESSAGE" = "true" ]; then
-	if which screen > /dev/null; then
-		detached_screens=`screen -list | grep Detached | sed -e 's/	(Detached)//'`
-		if [ ! -z "$detached_screens" ]; then
-			echo "+---------------------------------------+"
-			echo "| Detached screens are available:       |"
-			echo "$detached_screens"
-			echo "+---------------------------------------+"
-		fi
-	fi
-	export SHOWED_SCREEN_MESSAGE="true"
+        if which screen > /dev/null; then
+                detached_screens=`screen -list | grep Detached | sed -e 's/	(Detached)//'`
+                if [ ! -z "$detached_screens" ]; then
+                        echo "+---------------------------------------+"
+                        echo "| Detached screens are available:       |"
+                        echo "$detached_screens"
+                        echo "+---------------------------------------+"
+                fi
+        fi
+        export SHOWED_SCREEN_MESSAGE="true"
 fi
 
 # If available, source private extensions stored in a different repo
@@ -25,5 +25,5 @@ if [[ -a ~/.private/zshrc ]]; then
 fi
 
 if [[ -a ~/.zshrc-machine ]]; then
-	source ~/.zshrc-machine
+        source ~/.zshrc-machine
 fi