diff --git a/bash/.bashrc.d/autocomplete b/bash/.bashrc.d/autocomplete
index c2beb71..22b6bcb 100644
--- a/bash/.bashrc.d/autocomplete
+++ b/bash/.bashrc.d/autocomplete
@@ -17,6 +17,13 @@ function setup_completion() {
     export COMP_WORDBREAKS="${COMP_WORDBREAKS//\/}"
     bind 'set mark-directories on'
     bind 'set mark-symlinked-directories on'
+
+    for bash_comp in /etc /usr/share/bash-completion; do
+        if [ -f "$bash_comp/bash_completion" ]; then
+            . "$bash_comp/bash_completion"
+            break
+        fi
+    done
 }
 
 function setup_fzf() {
@@ -30,6 +37,5 @@ function setup_fzf() {
     done
 }
 
-. /etc/bash_completion
 setup_completion
 setup_fzf