diff --git a/bash/bashrc b/bash/bashrc
index 51169f4..66d3186 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -33,8 +33,8 @@ fi
 if [ -d "$DOTBASH/bashrc.d" ]; then
 	for f in colours.bash aliases.bash history.bash prompt_command.bash password-store.bash network.bash
 	do
-		if [ -r "$DOTBASH/bash.d/$f" ]; then
-			source "$DOTBASH/bash.d/$f"
+		if [ -r "$DOTBASH/bashrc.d/$f" ]; then
+			source "$DOTBASH/bashrc.d/$f"
 		fi
 	done
 fi
@@ -44,6 +44,8 @@ if [ -r "$DOTBASH/$HOSTNAME.bashrc" ]; then
 	source "$DOTBASH/$HOSTNAME.bashrc"
 fi
 
-if [ -r "$HOME/.bashrc.local" ]; then
-	source "$HOME/.bashrc.local"
-fi
+# Always source a local bashrc
+[ -r "$HOME/.bashrc.local" ] && source "$HOME/.bashrc.local"
+
+# Also check in .local for a bashrc
+[ -r "$HOME/.local/bashrc" ] && source "$HOME/.local/bashrc"