diff --git a/bashrc b/bashrc
index 3595d04..89ba24c 100644
--- a/bashrc
+++ b/bashrc
@@ -28,6 +28,9 @@ if [ -f "$HOME"/.bash_aliases ]; then source "$HOME"/.bash_aliases; fi
 if [ -f "$HOME"/.bash/aliases ]; then source "$HOME"/.bash/aliases; fi
 if [ -d "$HOME"/.bash/aliases ]; then for file in "$HOME"/.bash/aliases/*; do source "$file"; done; fi
 if [ -d "$HOME"/.bash/aliases.d ]; then for file in "$HOME"/.bash/aliases.d/*; do source "$file"; done; fi
+if (command -v _complete_alias &>/dev/null); then
+	for alias in $(alias -p | awk '{print $2}' | awk -F= '{print $1}'); do complete -o default -F _complete_alias "$alias"; done
+fi
 
 # Source bash completion definitions
 for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "$file"; done