diff -aur bash-completion-1.3/bash_completion bash-completion-1.3.patched/bash_completion
--- bash-completion-1.3/bash_completion	2011-02-06 20:16:00.000000000 +0100
+++ bash-completion-1.3.patched/bash_completion	2011-12-01 02:13:49.000000000 +0100
@@ -964,9 +964,7 @@
 #
 _modules()
 {
-    local modpath
-    modpath=/lib/modules/$1
-    COMPREPLY=( $( compgen -W "$( command ls -R $modpath | \
+    COMPREPLY=( $( compgen -W "$( command ls -R /lib/modules/{$1,$2} | \
         sed -ne 's/^\(.*\)\.k\{0,1\}o\(\.gz\)\{0,1\}$/\1/p' )" -- "$cur" ) )
 }
 
diff -aur bash-completion-1.3/completions/module-init-tools bash-completion-1.3.patched/completions/module-init-tools
--- bash-completion-1.3/completions/module-init-tools	2011-01-21 10:36:11.000000000 +0100
+++ bash-completion-1.3.patched/completions/module-init-tools	2011-12-01 02:14:21.000000000 +0100
@@ -45,7 +45,7 @@
         COMPREPLY=( $( compgen -W "$( /sbin/modinfo -p ${COMP_WORDS[1]} | \
             cut -d: -f1 )" -- "$cur" ) )
     else
-        _modules $(uname -r)
+        _modules $(uname -r) extramodules-$(uname -r | sed 's/\..-.//')
     fi
 
     return 0