diff --git a/.bash_aliases b/.bash_aliases/all
similarity index 100%
rename from .bash_aliases
rename to .bash_aliases/all
diff --git a/.bashrc b/.bashrc
index 18feafe..60088e2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,7 +5,8 @@ source /etc/os-release
 
 # Aliases {{{
 # Load aliases dynamically
-[ -f "$HOME/.bash_aliases" ] && source "$HOME/.bash_aliases"
+[ -f "$HOME/.bash_aliases/all" ] && source "$HOME/.bash_aliases/all"
+[ -f "$HOME/.bash_aliases/$HOSTNAME" ] && source "$HOME/.bash_aliases/$HOSTNAME"
 # }}}
 
 # Prompt {{{