diff --git a/bash_completion.d/sshmyshellconfig b/bash_completion.d/sshmyshellconfig
index 58af84e..01c2cff 100644
--- a/bash_completion.d/sshmyshellconfig
+++ b/bash_completion.d/sshmyshellconfig
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+#. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshmyshellconfig
diff --git a/bash_completion.d/sshs b/bash_completion.d/sshs
index 025afeb..1b8e5fb 100644
--- a/bash_completion.d/sshs
+++ b/bash_completion.d/sshs
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+#. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshs
diff --git a/bash_completion.d/sshserverconfig b/bash_completion.d/sshserverconfig
index 12800fe..d5d5284 100644
--- a/bash_completion.d/sshserverconfig
+++ b/bash_completion.d/sshserverconfig
@@ -1,2 +1,2 @@
-. /usr/share/bash-completion/completions/ssh
+#. /usr/share/bash-completion/completions/ssh
 shopt -u hostcomplete && complete -F _ssh sshserverconfig
diff --git a/bashrc_add b/bashrc_add
index c04c7f3..694b7ac 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -76,6 +76,21 @@ EOF
         fi
     }
 
+    # Check for interactive bash and that we haven't already been sourced.
+    if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
+
+        # Check for recent enough version of bash.
+        if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+           [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+            [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+                . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+            if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
+                # Source completion code.
+                . /usr/share/bash-completion/bash_completion
+            fi
+        fi
+
+    fi
 
 
     # source git-sync part of myshellconfig