diff --git a/.bashrc b/.bashrc
index e8b47469a52acfed9effccd82173bd20f988645c..b9d6c5114c2202bcfd61dad14eafb020f8304e9d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -28,10 +28,15 @@ if [ -x /usr/bin/dircolors ]; then
     alias grep='grep --color=auto'
 fi
 
-if [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
+if [ -n "$BASH" ]
+then
+    if [ -f /etc/bash_completion ]; then
+        . /etc/bash_completion
+    fi
+
+    [ -d $HOME/.bash_completion.d ] && . $HOME/.bash_completion.d/*
 fi
-[ -d $HOME/.bash_completion.d ] && . $HOME/.bash_completion.d/*
+
 if [ -f /usr/local/bin/virtualenvwrapper.sh ]
 then
     . /usr/local/bin/virtualenvwrapper.sh