diff --git a/bashrc b/bashrc
index 7ceee2f..34ec28d 100644
--- a/bashrc
+++ b/bashrc
@@ -89,7 +89,7 @@ if [[ $system == "Linux" ]]; then
   fi
 fi
 
-# hostname
+# hostname TODO could we not get rid of hostname command (not always installed)?
 # if hostname has 5 parts then host=.secondpart
 if [[ $(hostname | grep -o "\." | wc -l) -eq 4 ]]; then
   host='.'$(hostname | cut -f 2 -d '.')
@@ -161,7 +161,6 @@ alias vnc-gdm="sudo x11vnc -auth /run/user/$X_gdm_id/gdm/Xauthority -localhost -
 alias vnc-lightdm='sudo x11vnc -auth /var/run/lightdm/root/:0 -localhost -once -nopw -display :0'
 
 # load any additional configuration
-for f in ~/.bashrc-*; do
-  [ -e "$f" ] && . ~/.bashrc-*
-  break
+for f in ~/.bashrc.d/bashrc-*; do
+  [ -e "$f" ] && source $f
 done