diff --git a/.bashrc b/.bashrc
index c16633f..47ad17d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -71,14 +71,16 @@ else
 fi
 
 # Include drop-in files
-if [[ -d ~/.bashrc.d ]]; then
-	for f in ~/.bashrc.d/*; do
+if [[ -d ~/.config/bashrc.d ]]; then
+	for f in ~/.config/bashrc.d/*; do
 		[[ -f $f ]] && source "$f"
 	done
 fi
 
-# Include host-specific bashrc
-[[ -f ~/.bashrc.local ]] && source ~/.bashrc.local
+# Deprecation warning for old drop-in file locations
+if [[ -e ~/.bashrc.d || -e ~/.bashrc.local ]]; then
+	echo "WARNING: ~/.bashrc.d and ~/.bashrc.local are ignored, please use ~/.config/bashrc.d/ instead."
+fi
 
 # Clean up environment variables
 unset TRED TGREEN TBLUE TGREENB TCYANB TWHITEB TRESET
diff --git a/.bashrc.d/10_common_aliases.sh b/.config/bashrc.d/10_common.sh
similarity index 96%
rename from .bashrc.d/10_common_aliases.sh
rename to .config/bashrc.d/10_common.sh
index 00883f9..afa83de 100644
--- a/.bashrc.d/10_common_aliases.sh
+++ b/.config/bashrc.d/10_common.sh
@@ -1,5 +1,5 @@
 #
-# ~/.bashrc.d/10_common_aliases.sh -- Collection of common bash aliases and functions
+# ~/.config/bashrc.d/10_common.sh -- Collection of common bash aliases and functions
 #
 
 # Shortcut aliases
diff --git a/.bashrc.d/30_desktop.sh b/.config/bashrc.d/30_desktop.sh
similarity index 80%
rename from .bashrc.d/30_desktop.sh
rename to .config/bashrc.d/30_desktop.sh
index 87b06b8..c0d556e 100644
--- a/.bashrc.d/30_desktop.sh
+++ b/.config/bashrc.d/30_desktop.sh
@@ -1,5 +1,5 @@
 #
-# ~/.bashrc.d/30_desktop.sh -- Aliases and functions for desktop environments
+# ~/.config/bashrc.d/30_desktop.sh -- Aliases and functions for desktop environments
 #
 
 # Open files according to MIME type
diff --git a/.bashrc.d/60_server.sh b/.config/bashrc.d/60_server.sh
similarity index 85%
rename from .bashrc.d/60_server.sh
rename to .config/bashrc.d/60_server.sh
index 106b30f..9e41ec4 100644
--- a/.bashrc.d/60_server.sh
+++ b/.config/bashrc.d/60_server.sh
@@ -1,5 +1,5 @@
 #
-# ~/.bashrc.d/60_server.sh -- Custom .bashrc additions for server environments
+# ~/.config/bashrc.d/60_server.sh -- Custom .bashrc additions for server environments
 #
 
 # Set this alias only on hosts where restic is installed