--- bash_completion
+++ bash_completion	2013-04-23 14:12:26.449469882 +0000
@@ -1791,12 +1791,13 @@ _longopt()
     fi
 }
 # makeinfo and texi2dvi are defined elsewhere.
-complete -F _longopt a2ps awk base64 bash bc bison cat colordiff cp csplit \
-    cut date df diff dir du enscript env expand fmt fold gperf \
+complete -F _longopt -o filenames a2ps awk base64 bash bc bison cat colordiff cp csplit \
+    cut date df diff dir du enscript expand fmt fold gperf \
     grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
-    mv netstat nl nm objcopy objdump od paste pr ptx readelf rm rmdir \
-    sed seq sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
-    texindex touch tr uname unexpand uniq units vdir wc who
+    mv nl nm objcopy objdump od paste pr ptx readelf rm rmdir \
+    sed sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
+    texindex touch tr unexpand uniq vdir wc who
+complete -F _longopt -o default env netstat seq uname units
 
 declare -A _xspecs
 _filedir_xspec()