diff --git a/bashrc b/bashrc
index 58e4b1b..0399fff 100644
--- a/bashrc
+++ b/bashrc
@@ -83,6 +83,10 @@ _source_dir_files "${BASH_CONFIG_DIR}"/aliases.d
 # already be wired by the distro itself, typically via
 # /etc/profile.d/bash_completion.sh for login shells and the package's
 # own non-login hook — no need to re-source it manually here.
+#
+# Use bash-completion, if available
+[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
+    . /usr/share/bash-completion/bash_completion
 
 _source_file_if_exists ~/.bash_completion
 _source_file_if_exists "${BASH_CONFIG_DIR}"/completion
diff --git a/completion.d/mise b/completion.d/mise
index 93344fb..3759539 100644
--- a/completion.d/mise
+++ b/completion.d/mise
@@ -1,3 +1,4 @@
 if (command -v mise &>/dev/null); then
-	source <(mise completion bash --include-bash-completion-lib)
+	#source <(mise completion bash --include-bash-completion-lib)
+	source <(mise completion bash)
 fi