diff --git a/bash_completion b/bash_completion
index 9db11820..27cebb04 100644
--- a/bash_completion
+++ b/bash_completion
@@ -44,7 +44,8 @@ fi
 #
 [ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
 [ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
-readonly BASH_COMPLETION BASH_COMPLETION_DIR
+[ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d
+readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR
 
 # Set a couple of useful vars
 #
@@ -9320,7 +9321,15 @@ fi
 unset list
 
 # source completion directory definitions
+if [ -d $BASH_COMPLETION_COMPAT_DIR -a -r $BASH_COMPLETION_COMPAT_DIR -a \
+	 -x $BASH_COMPLETION_COMPAT_DIR ]; then
+	for i in $BASH_COMPLETION_COMPAT_DIR/*; do
+		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&
+			[ \( -f $i -o -h $i \) -a -r $i ] && . $i		
+	done
+fi
 if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
+     $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR -a \
      -x $BASH_COMPLETION_DIR ]; then
 	for i in $BASH_COMPLETION_DIR/*; do
 		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&