--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.bash_completion	Wed Sep 28 15:29:23 2011 +0300
@@ -0,0 +1,8 @@
+
+for f in ~/.bash_completion.d/*; do
+  . $f
+done
+
+# Local variables:
+# mode: shell-script
+# End:

--- a/.bashrc	Sun Sep 25 17:45:34 2011 +0300
+++ b/.bashrc	Wed Sep 28 15:29:23 2011 +0300
@@ -121,6 +121,10 @@
   # Under Cygwin bash completition start a long time.
   if [ ! "$OSTYPE" = cygwin ]; then
     . /etc/bash_completion
+    # But load local completion anyway.
+    if [ -f ~/.bash_completion ]; then
+      . ~/.bash_completion
+    fi
   fi
 fi
 if [ -f $HOME/usr/etc/bash_completion ]; then

--- a/Makefile	Sun Sep 25 17:45:34 2011 +0300
+++ b/Makefile	Wed Sep 28 15:29:23 2011 +0300
@@ -24,7 +24,7 @@
 
 OVERRIDDEN_ITEMS = \
     .inputrc .minttyrc .Xdefaults .xinitrc .xserverrc .screenrc .dircolors \
-    .bashrc .zshrc .vimrc .ssh \
+    .bashrc .bash_completion .zshrc .vimrc .ssh \
     .mailsign .muttrc .tidy \
     .dictrc \
     .hgrc .hgignore .bazaar .gitconfig .gitignore .cvs \