diff --git a/bash_completion b/bash_completion
index fe13b670..49dddd88 100644
--- a/bash_completion
+++ b/bash_completion
@@ -759,7 +759,7 @@ _service()
     return 0
 } &&
 complete -F _service service
-[ -d /etc/init.d/ ] && complete -F _service $default \
+[ -d /etc/init.d/ ] && complete -F _service -o default \
 $(for i in /etc/init.d/*; do echo ${i##*/}; done)
 
 
@@ -804,7 +804,7 @@ _chown()
         esac
     fi
 } # _chown()
-complete -F _chown $filenames chown
+complete -F _chown -o filenames chown
 
 
 # chgrp(1) completion
@@ -846,7 +846,7 @@ _chgrp()
 
     return 0
 } # _chgrp()
-complete -F _chgrp $filenames chgrp
+complete -F _chgrp -o filenames chgrp
 
 
 # umount(8) completion. This relies on the mount point being the third
@@ -863,7 +863,7 @@ _umount()
 
     return 0
 }
-complete -F _umount $dirnames umount
+complete -F _umount -o dirnames umount
 
 
 # mount(8) completion. This will pull a list of possible mounts out of
@@ -913,7 +913,7 @@ _mount()
 
     return 0
 } # _mount()
-complete -F _mount $default $dirnames mount
+complete -F _mount -o default -o dirnames mount
 
 
 # Linux rmmod(8) completion. This completes on a list of all currently
@@ -970,7 +970,7 @@ _insmod()
 
     return 0
 } # _insmod
-complete -F _insmod $filenames insmod modprobe modinfo
+complete -F _insmod -o filenames insmod modprobe modinfo
 } # have rmmod
 
 
@@ -1145,7 +1145,7 @@ _user_at_host() {
 
     return 0
 }
-shopt -u hostcomplete && complete -F _user_at_host $nospace talk ytalk finger
+shopt -u hostcomplete && complete -F _user_at_host -o nospace talk ytalk finger
 
 # NOTE: Using this function as a helper function is deprecated.  Use
 #       `_known_hosts_real' instead.
@@ -1381,9 +1381,9 @@ _cd()
     return 0
 }
 if shopt -q cdable_vars; then
-    complete -v -F _cd $nospace cd
+    complete -v -F _cd -o nospace cd
 else
-    complete -F _cd $nospace cd
+    complete -F _cd -o nospace cd
 fi
 
 # a wrapper method for the next one, when the offset is unknown
@@ -1480,14 +1480,14 @@ _command_offset()
 
     [ ${#COMPREPLY[@]} -eq 0 ] && _filedir
 }
-complete -F _command $filenames nohup exec nice eval time ltrace then \
+complete -F _command -o filenames nohup exec nice eval time ltrace then \
     else do vsound command xargs tsocks
 
 _root_command()
 {
     PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin _command $1 $2 $3
 }
-complete -F _root_command $filenames sudo fakeroot really gksudo gksu kdesudo
+complete -F _root_command -o filenames sudo fakeroot really gksudo gksu kdesudo
 
 _longopt()
 {
@@ -1525,12 +1525,12 @@ for i in a2ps autoconf automake bc gprof ld nm objcopy objdump readelf strip \
     tee who texindex cat csplit cut expand fmt fold head \
     md5sum nl od paste pr ptx sha1sum sort split tac tail tr unexpand \
     uniq wc ldd bash id irb mkdir rmdir; do
-    have $i && complete -F _longopt $filenames $i
+    have $i && complete -F _longopt -o filenames $i
 done
 
 # These commands do not use filenames, so '-o filenames' is not needed.
 for i in env netstat seq uname units wget; do
-    have $i && complete -F _longopt $default $i
+    have $i && complete -F _longopt -o default $i
 done
 unset i
 
@@ -1548,7 +1548,7 @@ _look()
         COMPREPLY=( $( compgen -W '$(look "$cur" 2>/dev/null)' ) )
     fi
 } &&
-complete -F _look $default look
+complete -F _look -o default look
 
 # id(1) completion
 #
@@ -1627,7 +1627,7 @@ list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' $BASH_COMPLETION | \
 if [ ${#list[@]} -gt 0 ]; then
     eval complete -r ${list[@]}
     # install new compspecs
-    eval complete -F _filedir_xspec $filenames "${list[@]}"
+    eval complete -F _filedir_xspec -o filenames "${list[@]}"
 fi
 unset list
 
diff --git a/contrib/_subversion b/contrib/_subversion
index 66a101c0..1563a7e1 100644
--- a/contrib/_subversion
+++ b/contrib/_subversion
@@ -270,7 +270,7 @@ _svn()
 
     return 0
 }
-complete -F _svn $filenames svn
+complete -F _svn -o filenames svn
 
 _svnadmin()
 {
@@ -349,7 +349,7 @@ _svnadmin()
 
         return 0
 }
-complete -F _svnadmin $default svnadmin
+complete -F _svnadmin -o default svnadmin
 
 _svnlook()
 {
@@ -416,7 +416,7 @@ _svnlook()
 
         return 0
 }
-complete -F _svnlook $default svnlook
+complete -F _svnlook -o default svnlook
 }
 
 # Local variables:
diff --git a/contrib/_yum b/contrib/_yum
index d61bc4b8..63fe0654 100644
--- a/contrib/_yum
+++ b/contrib/_yum
@@ -144,7 +144,7 @@ _yum()
     fi
 }
 } &&
-complete -F _yum $filenames yum
+complete -F _yum -o filenames yum
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/_yum-utils b/contrib/_yum-utils
index 7c2b9fe5..4e2cf00b 100644
--- a/contrib/_yum-utils
+++ b/contrib/_yum-utils
@@ -18,7 +18,7 @@ _repomanage()
         _filedir -d
     fi
 } &&
-complete -F _repomanage $filenames repomanage
+complete -F _repomanage -o filenames repomanage
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/ant b/contrib/ant
index 810b7dae..fe4bc4bc 100644
--- a/contrib/ant
+++ b/contrib/ant
@@ -59,8 +59,8 @@ _ant()
         fi
 }
 have complete-ant-cmd.pl && \
-     complete -C complete-ant-cmd.pl -F _ant $filenames ant || \
-     complete -F _ant $filenames ant
+     complete -C complete-ant-cmd.pl -F _ant -o filenames ant || \
+     complete -F _ant -o filenames ant
 }
 
 # Local variables:
diff --git a/contrib/apt b/contrib/apt
index 36c66c99..17fb4fe9 100644
--- a/contrib/apt
+++ b/contrib/apt
@@ -66,7 +66,7 @@ _apt_get()
 
     return 0
 } &&
-complete -F _apt_get $filenames apt-get
+complete -F _apt_get -o filenames apt-get
 
 # Debian apt-cache(8) completion.
 #
@@ -144,7 +144,7 @@ _apt_cache()
 
     return 0
 } &&
-complete -F _apt_cache $filenames apt-cache
+complete -F _apt_cache -o filenames apt-cache
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/apt-build b/contrib/apt-build
index 6031d61f..783a7eba 100644
--- a/contrib/apt-build
+++ b/contrib/apt-build
@@ -56,7 +56,7 @@ _apt_build()
 
     return 0
 } &&
-complete -F _apt_build $filenames apt-build
+complete -F _apt_build -o filenames apt-build
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/aptitude b/contrib/aptitude
index b83440ed..631a8f86 100644
--- a/contrib/aptitude
+++ b/contrib/aptitude
@@ -84,7 +84,7 @@ _aptitude()
 
     return 0
 }
-complete -F _aptitude $default aptitude
+complete -F _aptitude -o default aptitude
 }
 
 # Local variables:
diff --git a/contrib/aspell b/contrib/aspell
index 00184942..fc69942c 100644
--- a/contrib/aspell
+++ b/contrib/aspell
@@ -85,7 +85,7 @@ _aspell()
     fi
 
 }
-complete -F _aspell $filenames aspell
+complete -F _aspell -o filenames aspell
 }
 
 # Local variables:
diff --git a/contrib/bash-builtins b/contrib/bash-builtins
index c533a562..7c34673d 100644
--- a/contrib/bash-builtins
+++ b/contrib/bash-builtins
@@ -17,7 +17,7 @@ _alias()
             ;;
     esac
 }
-complete -F _alias $nospace alias
+complete -F _alias -o nospace alias
 
 # bash export completion
 #
@@ -43,7 +43,7 @@ _export()
             ;;
     esac
 }
-complete -F _export $default $nospace export
+complete -F _export -o default -o nospace export
 
 # bash shell function completion
 #
diff --git a/contrib/brctl b/contrib/brctl
index a612034c..59cfe1b5 100644
--- a/contrib/brctl
+++ b/contrib/brctl
@@ -37,7 +37,7 @@ _brctl()
             ;;
     esac
 } &&
-complete -F _brctl $default brctl
+complete -F _brctl -o default brctl
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/bzip2 b/contrib/bzip2
index e3234556..5a164556 100644
--- a/contrib/bzip2
+++ b/contrib/bzip2
@@ -35,7 +35,7 @@ _bzip2()
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _bzip2 $filenames bzip2
+complete -F _bzip2 -o filenames bzip2
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/clisp b/contrib/clisp
index 322faabb..18b783e4 100644
--- a/contrib/clisp
+++ b/contrib/clisp
@@ -20,7 +20,7 @@ _clisp()
 
     return 0
 } &&
-complete -F _clisp $default clisp
+complete -F _clisp -o default clisp
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/configure b/contrib/configure
index 3195bcb9..26adeae1 100644
--- a/contrib/configure
+++ b/contrib/configure
@@ -21,7 +21,7 @@ _configure()
             grep ^$cur ) )
     fi
 }
-complete -F _configure $default configure
+complete -F _configure -o default configure
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/cowsay b/contrib/cowsay
index 0a441446..f3ed3bd9 100644
--- a/contrib/cowsay
+++ b/contrib/cowsay
@@ -21,7 +21,7 @@ _cowsay()
         -- "$cur" ) )
 
 } &&
-complete -F _cowsay $default cowsay cowthink
+complete -F _cowsay -o default cowsay cowthink
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/cpan2dist b/contrib/cpan2dist
index e2147bfa..773a07e3 100644
--- a/contrib/cpan2dist
+++ b/contrib/cpan2dist
@@ -42,7 +42,7 @@ _cpan2dist()
             | awk '{print $1}' | sed -e 's/::/-/g' ) )
     fi
 } &&
-complete -F _cpan2dist $default cpan2dist
+complete -F _cpan2dist -o default cpan2dist
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/cups b/contrib/cups
index 0d7ceaba..9550808e 100644
--- a/contrib/cups
+++ b/contrib/cups
@@ -10,7 +10,7 @@ _cancel()
 
     COMPREPLY=( $( compgen -W "$( lpstat | cut -d' ' -f1 )" -- "$cur" ) )
 } &&
-complete -F _cancel $filenames cancel
+complete -F _cancel -o filenames cancel
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/cvs b/contrib/cvs
index 6ddaa086..581182a4 100644
--- a/contrib/cvs
+++ b/contrib/cvs
@@ -244,7 +244,7 @@ _cvs()
                 COMPREPLY=( $( compgen -W '${changed[@]:-} \
                            ${newremoved[@]:-}' -- "$cur" ) )
                 else
-                    COMPREPLY=( $(compgen $default -- "$cur") )
+                    COMPREPLY=( $(compgen -o default -- "$cur") )
                 fi
             else
                 COMPREPLY=( $( compgen -W "$( _cvs_command_options $mode )" \
@@ -372,7 +372,7 @@ _cvs()
 
     return 0
 }
-complete -F _cvs $default cvs
+complete -F _cvs -o default cvs
 }
 
 # Local variables:
diff --git a/contrib/dd b/contrib/dd
index 3c1d3c37..1fa291e8 100644
--- a/contrib/dd
+++ b/contrib/dd
@@ -28,7 +28,7 @@ _dd()
                 $( compgen -W 'bs cbs conv count ibs if obs of seek skip'\
                 -S '=' -- "$cur" ) )
 } &&
-complete -F _dd $nospace $filenames dd
+complete -F _dd -o nospace -o filenames dd
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/dict b/contrib/dict
index d24ef6f7..f58e59ed 100644
--- a/contrib/dict
+++ b/contrib/dict
@@ -66,7 +66,7 @@ _dict()
     [ -r $dictfile ] && \
         COMPREPLY=( $( compgen -W '$( cat $dictfile )' -- "$cur" ) )
 }
-complete -F _dict $default dict rdict
+complete -F _dict -o default dict rdict
 }
 
 # Local variables:
diff --git a/contrib/dpkg b/contrib/dpkg
index 6437b8af..83f518ed 100644
--- a/contrib/dpkg
+++ b/contrib/dpkg
@@ -91,7 +91,7 @@ _dpkg()
 
 
 }
-complete -F _dpkg $filenames dpkg dpkg-deb
+complete -F _dpkg -o filenames dpkg dpkg-deb
 }
 
 # Debian GNU dpkg-reconfigure(8) completion
@@ -127,7 +127,7 @@ _dpkg_reconfigure()
         COMPREPLY=( $( _comp_dpkg_installed_packages "$cur" ) )
     fi
 } &&
-complete -F _dpkg_reconfigure $default dpkg-reconfigure
+complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
 # Debian dpkg-source completion
 #
diff --git a/contrib/dselect b/contrib/dselect
index 31ad2de8..00d5cf72 100644
--- a/contrib/dselect
+++ b/contrib/dselect
@@ -31,7 +31,7 @@ _dselect()
 
     return 0
 } &&
-complete -F _dselect $filenames dselect
+complete -F _dselect -o filenames dselect
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/findutils b/contrib/findutils
index 5108f43c..38f2b377 100644
--- a/contrib/findutils
+++ b/contrib/findutils
@@ -109,7 +109,7 @@ _find()
 
     return 0
 } &&
-complete -F _find $filenames find
+complete -F _find -o filenames find
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/gcc b/contrib/gcc
index a4f80952..dabe87fc 100644
--- a/contrib/gcc
+++ b/contrib/gcc
@@ -46,9 +46,9 @@ _gcc()
         _filedir
     fi
 } &&
-complete $filenames -F _gcc gcc g++ c++ g77 gcj gpc
+complete -o filenames -F _gcc gcc g++ c++ g77 gcj gpc
 [ $USERLAND = GNU -o $UNAME = Cygwin ] && \
-[ -n "${have:-}" ] && complete $filenames -F _gcc cc
+[ -n "${have:-}" ] && complete -o filenames -F _gcc cc
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/gcl b/contrib/gcl
index ce6923fc..e3df88cf 100644
--- a/contrib/gcl
+++ b/contrib/gcl
@@ -19,7 +19,7 @@ _gcl()
 
     return 0
 } &&
-complete -F _gcl $default gcl
+complete -F _gcl -o default gcl
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/gdb b/contrib/gdb
index 7ea304e1..ddb73481 100644
--- a/contrib/gdb
+++ b/contrib/gdb
@@ -32,7 +32,7 @@ _gdb()
             awk '{if ($1 ~ /^'"$prev"'/) print $2}' )" -- "$cur" ) )
     fi
 } &&
-complete -F _gdb $default gdb
+complete -F _gdb -o default gdb
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/genisoimage b/contrib/genisoimage
index d465192a..ec7afcff 100644
--- a/contrib/genisoimage
+++ b/contrib/genisoimage
@@ -66,7 +66,7 @@ _mkisofs()
     fi
 
 } &&
-complete -F _mkisofs $filenames mkisofs genisoimage
+complete -F _mkisofs -o filenames mkisofs genisoimage
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/gkrellm b/contrib/gkrellm
index 59acde7c..ff750adc 100644
--- a/contrib/gkrellm
+++ b/contrib/gkrellm
@@ -44,7 +44,7 @@ _gkrellm()
     fi
 
 } &&
-complete -F _gkrellm $filenames gkrellm gkrellm2
+complete -F _gkrellm -o filenames gkrellm gkrellm2
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/gnatmake b/contrib/gnatmake
index 3b66aa31..42e9bcef 100644
--- a/contrib/gnatmake
+++ b/contrib/gnatmake
@@ -26,7 +26,7 @@ _gnatmake()
         _filedir '@(adb|ads)'
     fi
 } &&
-complete -F _gnatmake $filenames gnatmake
+complete -F _gnatmake -o filenames gnatmake
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/gpg b/contrib/gpg
index f05fb1fc..76c845a1 100644
--- a/contrib/gpg
+++ b/contrib/gpg
@@ -37,7 +37,7 @@ _gpg()
      fi
 
 } &&
-complete -F _gpg $default gpg
+complete -F _gpg -o default gpg
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/gpg2 b/contrib/gpg2
index 83dc4d7d..607797c5 100644
--- a/contrib/gpg2
+++ b/contrib/gpg2
@@ -40,7 +40,7 @@ _gpg2 ()
         COMPREPLY=( $( compgen -W '$(gpg2 --dump-options)' -- "$cur" ) )
     fi
 } &&
-complete -F _gpg2 $default gpg2
+complete -F _gpg2 -o default gpg2
 }
 
 # Local variables:
diff --git a/contrib/gzip b/contrib/gzip
index 0bfd748a..00dd4a5f 100644
--- a/contrib/gzip
+++ b/contrib/gzip
@@ -37,7 +37,7 @@ _gzip()
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _gzip $filenames gzip
+complete -F _gzip -o filenames gzip
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/iconv b/contrib/iconv
index cf497e99..58fa59ed 100644
--- a/contrib/iconv
+++ b/contrib/iconv
@@ -24,7 +24,7 @@ _iconv()
         return 0
     fi
 } &&
-complete -F _iconv $default iconv
+complete -F _iconv -o default iconv
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/imagemagick b/contrib/imagemagick
index ed2d01e0..43a55513 100644
--- a/contrib/imagemagick
+++ b/contrib/imagemagick
@@ -189,7 +189,7 @@ _convert()
         _filedir
     fi
 }
-complete -F _convert $filenames convert
+complete -F _convert -o filenames convert
 
 _mogrify()
 {
@@ -245,7 +245,7 @@ _mogrify()
         _filedir
     fi
 }
-complete -F _mogrify $filenames mogrify
+complete -F _mogrify -o filenames mogrify
 
 _display()
 {
@@ -285,7 +285,7 @@ _display()
         _filedir
     fi
 }
-complete -F _display $filenames display
+complete -F _display -o filenames display
 
 _animate()
 {
@@ -319,7 +319,7 @@ _animate()
         _filedir
     fi
 }
-complete -F _animate $filenames animate
+complete -F _animate -o filenames animate
 
 _identify()
 {
@@ -344,7 +344,7 @@ _identify()
         _filedir
     fi
 }
-complete -F _identify $filenames identify
+complete -F _identify -o filenames identify
 
 _montage()
 {
@@ -382,7 +382,7 @@ _montage()
         _filedir
     fi
 }
-complete -F _montage $filenames montage
+complete -F _montage -o filenames montage
 
 _composite()
 {
@@ -417,7 +417,7 @@ _composite()
         _filedir
     fi
 }
-complete -F _composite $filenames composite
+complete -F _composite -o filenames composite
 
 _compare()
 {
@@ -444,7 +444,7 @@ _compare()
         _filedir
     fi
 }
-complete -F _compare $filenames compare
+complete -F _compare -o filenames compare
 
 _conjure()
 {
@@ -464,7 +464,7 @@ _conjure()
         _filedir
     fi
 }
-complete -F _conjure $filenames conjure
+complete -F _conjure -o filenames conjure
 
 _import()
 {
@@ -495,7 +495,7 @@ _import()
         _filedir
     fi
 }
-complete -F _import $filenames import
+complete -F _import -o filenames import
 
 _stream()
 {
@@ -520,7 +520,7 @@ _stream()
         _filedir
     fi
 }
-complete -F _stream $filenames stream
+complete -F _stream -o filenames stream
 }
 
 # Local variables:
diff --git a/contrib/info b/contrib/info
index 5d491453..691edf64 100644
--- a/contrib/info
+++ b/contrib/info
@@ -47,7 +47,7 @@ _info()
 
     return 0
 } &&
-complete -F _info $filenames info
+complete -F _info -o filenames info
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/jar b/contrib/jar
index 6ef632bf..437a8720 100644
--- a/contrib/jar
+++ b/contrib/jar
@@ -25,7 +25,7 @@ _jar()
             ;;
     esac
 } &&
-complete -F _jar $filenames jar
+complete -F _jar -o filenames jar
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/java b/contrib/java
index 88e91c50..d1fbdebf 100644
--- a/contrib/java
+++ b/contrib/java
@@ -166,7 +166,7 @@ _java()
         fi
     fi
 }
-complete -F _java $filenames java
+complete -F _java -o filenames java
 }
 
 have javadoc &&
@@ -215,7 +215,7 @@ _javadoc()
         _java_packages
     fi
 } &&
-complete -F _javadoc $filenames javadoc
+complete -F _javadoc -o filenames javadoc
 
 have javac &&
 _javac()
@@ -248,7 +248,7 @@ _javac()
         _filedir java
     fi
 } &&
-complete -F _javac $filenames javac
+complete -F _javac -o filenames javac
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/kldload b/contrib/kldload
index 36207afb..cda38ba8 100644
--- a/contrib/kldload
+++ b/contrib/kldload
@@ -17,7 +17,7 @@ _kldload()
 
     return 0
 }
-complete -F _kldload $filenames kldload
+complete -F _kldload -o filenames kldload
 
 _kldunload()
 {
@@ -25,7 +25,7 @@ _kldunload()
     cur=`_get_cword`
     COMPREPLY=( $(kldstat | sed -ne "s/^.*[ \t]\+\($cur[a-z_]\+\).ko$/\1/p") )
 }
-complete -F _kldunload $filenames kldunload
+complete -F _kldunload -o filenames kldunload
 
 }
 
diff --git a/contrib/larch b/contrib/larch
index c3a55199..3a559332 100644
--- a/contrib/larch
+++ b/contrib/larch
@@ -38,7 +38,7 @@ _larch()
 
     return 0
 } &&
-complete -F _larch $default larch
+complete -F _larch -o default larch
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/lftp b/contrib/lftp
index 7901a70b..d3f0016c 100644
--- a/contrib/lftp
+++ b/contrib/lftp
@@ -29,7 +29,7 @@ _lftp()
         '$( cut -f 1 -s ~/.lftp/bookmarks 2>/dev/null )' -- "$cur" ) )
     _known_hosts_real "$cur"
 } &&
-complete -F _lftp $filenames lftp
+complete -F _lftp -o filenames lftp
 have lftpget &&
 _lftpget()
 {
diff --git a/contrib/links b/contrib/links
index b2b41cff..76b68bf1 100644
--- a/contrib/links
+++ b/contrib/links
@@ -32,7 +32,7 @@ _links()
 
     return 0
 } &&
-complete -F _links $filenames links
+complete -F _links -o filenames links
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/lisp b/contrib/lisp
index cf9e2f8b..a88db35a 100644
--- a/contrib/lisp
+++ b/contrib/lisp
@@ -20,7 +20,7 @@ _lisp()
 
     return 0
 } &&
-complete -F _lisp $default lisp
+complete -F _lisp -o default lisp
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/lzma b/contrib/lzma
index 6cc99b86..8f14e489 100644
--- a/contrib/lzma
+++ b/contrib/lzma
@@ -35,7 +35,7 @@ _lzma()
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _lzma $filenames lzma
+complete -F _lzma -o filenames lzma
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/lzop b/contrib/lzop
index 5602f69b..d931f038 100644
--- a/contrib/lzop
+++ b/contrib/lzop
@@ -58,7 +58,7 @@ _lzop()
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
             $( compgen -d -- "$cur" ) )
 } &&
-complete -F _lzop $filenames lzop
+complete -F _lzop -o filenames lzop
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/mailman b/contrib/mailman
index e2020f97..6c742f5c 100644
--- a/contrib/mailman
+++ b/contrib/mailman
@@ -376,7 +376,7 @@ _config_list()
     fi
 
 } &&
-complete -F _config_list $filenames config_list
+complete -F _config_list -o filenames config_list
 
 have arch &&
 _arch()
@@ -423,7 +423,7 @@ _arch()
     fi
 
 } &&
-complete -F _arch $filenames arch
+complete -F _arch -o filenames arch
 
 have cleanarch &&
 _cleanarch()
@@ -468,7 +468,7 @@ _inject()
     fi
 
 } &&
-complete -F _inject $filenames inject
+complete -F _inject -o filenames inject
 
 have dumpdb &&
 _dumpdb()
@@ -486,7 +486,7 @@ _dumpdb()
     fi
 
 } &&
-complete -F _dumpdb $filenames dumpdb
+complete -F _dumpdb -o filenames dumpdb
 
 have check_db &&
 _check_db()
diff --git a/contrib/make b/contrib/make
index ecbd56e3..be818ddb 100644
--- a/contrib/make
+++ b/contrib/make
@@ -68,7 +68,7 @@ _make()
 
     fi
 } &&
-complete -F _make $filenames make gmake gnumake pmake
+complete -F _make -o filenames make gmake gnumake pmake
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/man b/contrib/man
index 4804a949..ead03eb9 100644
--- a/contrib/man
+++ b/contrib/man
@@ -72,7 +72,7 @@ _man()
 [ $USERLAND = GNU -o $UNAME = Darwin \
   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
   -o $UNAME = OpenBSD ] && \
-complete -F _man $filenames man apropos whatis
+complete -F _man -o filenames man apropos whatis
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/mc b/contrib/mc
index a8548886..fafcdb05 100644
--- a/contrib/mc
+++ b/contrib/mc
@@ -37,7 +37,7 @@ _mc()
         _filedir -d
     fi
 } &&
-complete -F _mc $filenames mc
+complete -F _mc -o filenames mc
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/mcrypt b/contrib/mcrypt
index 4d0145a7..0a38cf83 100644
--- a/contrib/mcrypt
+++ b/contrib/mcrypt
@@ -74,7 +74,7 @@ _mcrypt()
         fi
     fi
 } &&
-complete $filenames -F _mcrypt mcrypt mdecrypt
+complete -o filenames -F _mcrypt mcrypt mdecrypt
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/minicom b/contrib/minicom
index 4b6a9e71..d362ad8e 100644
--- a/contrib/minicom
+++ b/contrib/minicom
@@ -43,7 +43,7 @@ _minicom()
         fi
     fi
 } &&
-complete -F _minicom $default minicom
+complete -F _minicom -o default minicom
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/mock b/contrib/mock
index a5ff16f1..7ea299c0 100644
--- a/contrib/mock
+++ b/contrib/mock
@@ -73,7 +73,7 @@ _mock()
         _filedir '?(no)src.rpm'
     fi
 } &&
-complete -F _mock $filenames mock
+complete -F _mock -o filenames mock
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/modules b/contrib/modules
index f057411c..674d639a 100644
--- a/contrib/modules
+++ b/contrib/modules
@@ -78,7 +78,7 @@ _module ()
     fi
     return 0
 }
-complete -F _module $default module
+complete -F _module -o default module
 }
 
 # Local variables:
diff --git a/contrib/monodevelop b/contrib/monodevelop
index 5ec82021..3c914b6e 100644
--- a/contrib/monodevelop
+++ b/contrib/monodevelop
@@ -51,7 +51,7 @@ _mdtool()
                 return 0
                 ;;
             "generate-makefiles")
-                COMPREPLY=( $( compgen $filenames -G"*.mds" -- "$cur" ) )
+                COMPREPLY=( $( compgen -o filenames -G"*.mds" -- "$cur" ) )
                 if [[ "$prev" == *mds ]]; then
                     COMPREPLY=( $( compgen -W '--simple-makefiles --s --d:' \
                         -- "$cur" ) )
@@ -75,7 +75,7 @@ _mdtool()
 
     return 0
 } &&
-complete -F _mdtool $filenames mdtool
+complete -F _mdtool -o filenames mdtool
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/mplayer b/contrib/mplayer
index 157a7d83..b8e17a6a 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -231,7 +231,7 @@ _mplayer()
 
     return 0
 }
-complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer
+complete -o filenames -F _mplayer mplayer mencoder gmplayer kplayer
 }
 
 # Local variables:
diff --git a/contrib/mutt b/contrib/mutt
index 62540bde..d532258f 100644
--- a/contrib/mutt
+++ b/contrib/mutt
@@ -134,7 +134,7 @@ _mutt()
     esac
 
 }
-complete -F _mutt $default $filenames mutt muttng
+complete -F _mutt -o default -o filenames mutt muttng
 }
 
 # Local variables:
diff --git a/contrib/mysqladmin b/contrib/mysqladmin
index 407fdb73..399759bb 100644
--- a/contrib/mysqladmin
+++ b/contrib/mysqladmin
@@ -61,7 +61,7 @@ _mysqladmin()
         kill password old-password ping processlist reload refresh shutdown \
         status start-slave stop-slave variables version' -- "$cur" ) )
 } &&
-complete -F _mysqladmin $filenames mysqladmin
+complete -F _mysqladmin -o filenames mysqladmin
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/ncftp b/contrib/ncftp
index 6d5a611a..adb88a44 100644
--- a/contrib/ncftp
+++ b/contrib/ncftp
@@ -15,7 +15,7 @@ _ncftp()
 
     return 0
 } &&
-complete -F _ncftp $default ncftp
+complete -F _ncftp -o default ncftp
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/net-tools b/contrib/net-tools
index 7f00dc50..479eb9bd 100644
--- a/contrib/net-tools
+++ b/contrib/net-tools
@@ -33,7 +33,7 @@ _mii_tool()
         _available_interfaces -a
     fi
 } &&
-complete -F _mii_tool $default mii-tool
+complete -F _mii_tool -o default mii-tool
 
 have mii-diag &&
 _mii_diag()
@@ -66,7 +66,7 @@ _mii_diag()
         _available_interfaces -a
     fi
 } &&
-complete -F _mii_diag $default mii-diag
+complete -F _mii_diag -o default mii-diag
 
 # Linux route(8) completion
 #
diff --git a/contrib/openssl b/contrib/openssl
index 8fdbb87d..db929a59 100644
--- a/contrib/openssl
+++ b/contrib/openssl
@@ -239,7 +239,7 @@ _openssl()
         fi
     fi
 }
-complete -F _openssl $default openssl
+complete -F _openssl -o default openssl
 }
 
 # Local variables:
diff --git a/contrib/p4 b/contrib/p4
index 4e7fc3d3..d07fdd5f 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -49,7 +49,7 @@ _p4()
 
     return 0
 } &&
-complete -F _p4 $default p4 g4
+complete -F _p4 -o default p4 g4
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/perl b/contrib/perl
index 981d5bc5..1e848031 100644
--- a/contrib/perl
+++ b/contrib/perl
@@ -47,7 +47,7 @@ _perl()
         _filedir
     fi
 }
-complete -F _perl $nospace $filenames perl
+complete -F _perl -o nospace -o filenames perl
 
 _perldoc()
 {
@@ -115,7 +115,7 @@ _perldoc()
         fi
     fi
 }
-complete -F _perldoc $default perldoc
+complete -F _perldoc -o default perldoc
 }
 
 # Local variables:
diff --git a/contrib/pine b/contrib/pine
index cee6587d..7335635d 100644
--- a/contrib/pine
+++ b/contrib/pine
@@ -11,7 +11,7 @@ _pineaddr()
     COMPREPLY=( $( compgen -W '$( awk "{print \$1}" ~/.addressbook \
         2>/dev/null)' -- "$cur" ) )
 } &&
-complete -F _pineaddr $default pine alpine
+complete -F _pineaddr -o default pine alpine
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/pkg_install b/contrib/pkg_install
index 3bdf2b77..443a9ac1 100644
--- a/contrib/pkg_install
+++ b/contrib/pkg_install
@@ -18,7 +18,7 @@ _pkg_delete()
 
     return 0
 }
-complete -F _pkg_delete $dirnames pkg_delete pkg_info
+complete -F _pkg_delete -o dirnames pkg_delete pkg_info
 
 }
 
diff --git a/contrib/pkgtools b/contrib/pkgtools
index c8092b7c..4a6b068c 100644
--- a/contrib/pkgtools
+++ b/contrib/pkgtools
@@ -10,8 +10,8 @@ _removepkg()
 
     COMPREPLY=( $( (cd /var/log/packages; compgen -f -- "$cur") ) )
 } &&
-complete -F _removepkg $filenames removepkg &&
-    complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg
+complete -F _removepkg -o filenames removepkg &&
+    complete -o dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/portupgrade b/contrib/portupgrade
index b9914730..cc051b17 100644
--- a/contrib/portupgrade
+++ b/contrib/portupgrade
@@ -17,7 +17,7 @@ _portupgrade()
 
     return 0
 } &&
-complete -F _portupgrade $dirnames portupgrade
+complete -F _portupgrade -o dirnames portupgrade
 
 have portinstall &&
 _portinstall()
@@ -44,11 +44,11 @@ _portinstall()
 
     return 0
 } &&
-complete -F _portinstall $dirnames portinstall
+complete -F _portinstall -o dirnames portinstall
 
 # _pkg_delete is in pkg_install
 type _pkg_delete &>/dev/null && have pkg_deinstall && \
-complete -F _pkg_delete $dirnames pkg_deinstall
+complete -F _pkg_delete -o dirnames pkg_deinstall
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/postfix b/contrib/postfix
index dccdc1e5..e3712aa9 100644
--- a/contrib/postfix
+++ b/contrib/postfix
@@ -30,7 +30,7 @@ _postfix()
     COMPREPLY=( $( compgen -W 'check start stop abort flush reload status \
         set-permissions upgrade-configuration' -- "$cur" ) )
 }
-complete -F _postfix $filenames postfix
+complete -F _postfix -o filenames postfix
 
 # postalias(1) and postmap(1)
 #
@@ -75,7 +75,7 @@ _postmap()
     fi
     return 0
 }
-complete -F _postmap $filenames postmap postalias
+complete -F _postmap -o filenames postmap postalias
 
 # postcat(1)
 #
@@ -119,7 +119,7 @@ _postcat()
         return 0
     fi
 }
-complete -F _postcat $filenames postcat
+complete -F _postcat -o filenames postcat
 
 # postconf(1)
 #
@@ -162,7 +162,7 @@ _postconf()
     done
     return 0
 }
-complete -F _postconf $filenames postconf
+complete -F _postconf -o filenames postconf
 
 # postsuper(1)
 #
@@ -224,7 +224,7 @@ _postsuper()
 
     COMPREPLY=( $( compgen -W 'hold incoming active deferred' -- "$cur" ) )
 }
-complete -F _postsuper $filenames postsuper
+complete -F _postsuper -o filenames postsuper
 }
 
 # Local variables:
diff --git a/contrib/postgresql b/contrib/postgresql
index 79692cb8..d63301d2 100644
--- a/contrib/postgresql
+++ b/contrib/postgresql
@@ -59,7 +59,7 @@ _createdb()
         _pg_databases
     fi
 }
-complete -F _createdb $default createdb
+complete -F _createdb -o default createdb
 
 # dropdb(1) completion
 #
@@ -97,7 +97,7 @@ _dropdb()
         _pg_databases
     fi
 }
-complete -F _dropdb $default dropdb
+complete -F _dropdb -o default dropdb
 
 # psql(1) completion
 #
@@ -154,7 +154,7 @@ _psql()
         _pg_databases
     fi
 }
-complete -F _psql $filenames psql
+complete -F _psql -o filenames psql
 }
 
 # Local variables:
diff --git a/contrib/povray b/contrib/povray
index 4a4df011..a2ff7b31 100644
--- a/contrib/povray
+++ b/contrib/povray
@@ -55,7 +55,7 @@ _povray()
             ;;
     esac
 } &&
-complete -F _povray $filenames povray xpovray spovray
+complete -F _povray -o filenames povray xpovray spovray
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/python b/contrib/python
index 6bd4e0ce..33f31d27 100644
--- a/contrib/python
+++ b/contrib/python
@@ -48,7 +48,7 @@ _python()
 
     return 0
 } &&
-complete -F _python $filenames python
+complete -F _python -o filenames python
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/qemu b/contrib/qemu
index 1314b688..6711128c 100644
--- a/contrib/qemu
+++ b/contrib/qemu
@@ -121,7 +121,7 @@ _qemu()
         _filedir
     fi
 } &&
-complete -F _qemu $filenames qemu
+complete -F _qemu -o filenames qemu
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/quota-tools b/contrib/quota-tools
index bc5346c3..334347c4 100644
--- a/contrib/quota-tools
+++ b/contrib/quota-tools
@@ -58,7 +58,7 @@ _quota()
         _user_or_group
     fi
 }
-complete -F _quota $default quota
+complete -F _quota -o default quota
 
 _setquota()
 {
@@ -98,7 +98,7 @@ _setquota()
 
     fi
 }
-complete -F _setquota $default setquota
+complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -131,7 +131,7 @@ _edquota()
         _user_or_group
     fi
 }
-complete -F _edquota $default edquota
+complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -161,7 +161,7 @@ _quotacheck()
         _filesystems
     fi
 }
-complete -F _quotacheck $default quotacheck
+complete -F _quotacheck -o default quotacheck
 
 _repquota()
 {
@@ -191,7 +191,7 @@ _repquota()
         _filesystems
     fi
 }
-complete -F _repquota $default repquota
+complete -F _repquota -o default repquota
 
 _quotaon()
 {
@@ -219,7 +219,7 @@ _quotaon()
         _filesystems
     fi
 }
-complete -F _quotaon $default quotaon
+complete -F _quotaon -o default quotaon
 
 _quotaoff()
 {
@@ -252,7 +252,7 @@ _quotaoff()
         _filesystems
     fi
 }
-complete -F _quotaoff $default quotaoff
+complete -F _quotaoff -o default quotaoff
 }
 
 # Local variables:
diff --git a/contrib/rcs b/contrib/rcs
index a6505deb..0fb3fecb 100644
--- a/contrib/rcs
+++ b/contrib/rcs
@@ -33,7 +33,7 @@ _rcs()
     # otherwise, default to directories
     [ ${#COMPREPLY[@]} -eq 0 -a $1 = ci ] && _filedir || _filedir -d
 } &&
-complete -F _rcs $filenames ci co rlog rcs rcsdiff
+complete -F _rcs -o filenames ci co rlog rcs rcsdiff
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/rdesktop b/contrib/rdesktop
index 79514e7a..0081adaa 100644
--- a/contrib/rdesktop
+++ b/contrib/rdesktop
@@ -31,7 +31,7 @@ _rdesktop()
             return 0
             ;;
         -r)
-            # FIXME: should do $nospace for the colon options
+            # FIXME: should do -o nospace for the colon options
             COMPREPLY=( $( compgen -W 'comport: disk: lptport: \
                 printer: sound: lspci scard' -- "$cur" ) )
             return 0
diff --git a/contrib/reportbug b/contrib/reportbug
index b6cb5e26..8071ba1b 100644
--- a/contrib/reportbug
+++ b/contrib/reportbug
@@ -78,7 +78,7 @@ _reportbug()
     _filedir
     return 0
 } &&
-complete -F _reportbug $filenames reportbug
+complete -F _reportbug -o filenames reportbug
 
 have querybts &&
 _querybts()
@@ -116,7 +116,7 @@ _querybts()
         www.debian.org' -- "$cur" ) \
         $( apt-cache pkgnames -- "$cur" 2> /dev/null) )
 } &&
-complete -F _querybts $filenames querybts
+complete -F _querybts -o filenames querybts
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/rpm b/contrib/rpm
index 0aad0f5a..686a90a4 100644
--- a/contrib/rpm
+++ b/contrib/rpm
@@ -288,7 +288,7 @@ _rpm()
 
     return 0
 }
-complete -F _rpm $filenames rpm rpmbuild
+complete -F _rpm -o filenames rpm rpmbuild
 }
 
 # Local variables:
diff --git a/contrib/rsync b/contrib/rsync
index ed365111..254d64c2 100644
--- a/contrib/rsync
+++ b/contrib/rsync
@@ -88,7 +88,7 @@ _rsync()
 
     return 0
 } &&
-complete -F _rsync $nospace $filenames rsync
+complete -F _rsync -o nospace -o filenames rsync
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/sbcl b/contrib/sbcl
index 7a12f89d..5dfc6723 100644
--- a/contrib/sbcl
+++ b/contrib/sbcl
@@ -20,7 +20,7 @@ _sbcl()
 
     return 0
 } &&
-complete -F _sbcl $filenames sbcl sbcl-mt
+complete -F _sbcl -o filenames sbcl sbcl-mt
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/screen b/contrib/screen
index cd6baea2..fe1de5f4 100644
--- a/contrib/screen
+++ b/contrib/screen
@@ -58,7 +58,7 @@ _screen()
             -wipe -x -X' -- "$cur" ) )
     fi
 } &&
-complete -F _screen $default screen
+complete -F _screen -o default screen
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/shadow b/contrib/shadow
index b7bb351e..540d3e4f 100644
--- a/contrib/shadow
+++ b/contrib/shadow
@@ -235,7 +235,7 @@ _newusers()
 
     _filedir
 } &&
-complete -F _newusers $filenames newusers
+complete -F _newusers -o filenames newusers
 
 have pwck &&
 _pwck()
@@ -252,7 +252,7 @@ _pwck()
 
     _filedir
 } &&
-complete -F _pwck $filenames pwck
+complete -F _pwck -o filenames pwck
 
 have groupadd &&
 _groupadd()
@@ -395,7 +395,7 @@ _grpck()
 
     _filedir
 } &&
-complete -F _grpck $filenames grpck
+complete -F _grpck -o filenames grpck
 
 have vipw || have vigr &&
 _vipw()
diff --git a/contrib/sitecopy b/contrib/sitecopy
index abf3d928..9d82d77d 100644
--- a/contrib/sitecopy
+++ b/contrib/sitecopy
@@ -29,7 +29,7 @@ _sitecopy()
 
     return 0
 } &&
-complete -F _sitecopy $default sitecopy
+complete -F _sitecopy -o default sitecopy
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/ssh b/contrib/ssh
index 112f1ae4..eaa168ca 100644
--- a/contrib/ssh
+++ b/contrib/ssh
@@ -213,7 +213,7 @@ _scp()
         [[ "$cur" == */* ]] || _known_hosts_real -c -a -F "$configfile" "$cur"
     fi
     # This approach is used instead of _filedir to get a space appended
-    # after local file/dir completions, and $nospace retained for others.
+    # after local file/dir completions, and -o nospace retained for others.
     local IFS=$'\t\n'
     COMPREPLY=( "${COMPREPLY[@]}" $( command ls -aF1d $cur* 2>/dev/null | sed \
         -e "s/[][(){}<>\",:;^&\!$=?\`|\\ ']/\\\\&/g" \
@@ -221,7 +221,7 @@ _scp()
 
     return 0
 }
-complete -F _scp $nospace scp sshfs
+complete -F _scp -o nospace scp sshfs
 
 # ssh-copy-id(1) completion
 #
@@ -248,7 +248,7 @@ _ssh_copy_id()
 
     return 0
 }
-complete -F _ssh_copy_id $filenames ssh-copy-id
+complete -F _ssh_copy_id -o filenames ssh-copy-id
 }
 
 # Local variables:
diff --git a/contrib/strace b/contrib/strace
index fd2a12ca..5fcdcad0 100644
--- a/contrib/strace
+++ b/contrib/strace
@@ -92,7 +92,7 @@ _strace()
         fi
     fi
 } &&
-complete -F _strace $default strace
+complete -F _strace -o default strace
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/svk b/contrib/svk
index 1b6f70fd..ffd2e02e 100644
--- a/contrib/svk
+++ b/contrib/svk
@@ -216,7 +216,7 @@ _svk()
 
     return 0
 } &&
-complete -F _svk $filenames svk
+complete -F _svk -o filenames svk
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/tar b/contrib/tar
index 0802c881..7ca80f71 100644
--- a/contrib/tar
+++ b/contrib/tar
@@ -59,8 +59,8 @@ _tar()
 
     return 0
 }
-[ -n "${COMP_TAR_INTERNAL_PATHS:-}" ] && complete -F _tar $dirnames tar ||
-    complete -F _tar $filenames tar
+[ -n "${COMP_TAR_INTERNAL_PATHS:-}" ] && complete -F _tar -o dirnames tar ||
+    complete -F _tar -o filenames tar
 }
 
 # Local variables:
diff --git a/contrib/unace b/contrib/unace
index d006ffbd..e2d3e43e 100644
--- a/contrib/unace
+++ b/contrib/unace
@@ -25,7 +25,7 @@ _unace()
     return 0
 
 } &&
-complete -F _unace $filenames unace
+complete -F _unace -o filenames unace
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/unrar b/contrib/unrar
index a97fb0d1..47a0a40f 100644
--- a/contrib/unrar
+++ b/contrib/unrar
@@ -25,7 +25,7 @@ _unrar()
 
     return 0
 } &&
-complete -F _unrar $filenames unrar
+complete -F _unrar -o filenames unrar
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/wodim b/contrib/wodim
index 80a37291..6798b084 100644
--- a/contrib/wodim
+++ b/contrib/wodim
@@ -74,7 +74,7 @@ _cdrecord()
     fi
 
 } &&
-complete -F _cdrecord $filenames cdrecord wodim
+complete -F _cdrecord -o filenames cdrecord wodim
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/wtf b/contrib/wtf
index 4744e5f1..56d0d2e0 100644
--- a/contrib/wtf
+++ b/contrib/wtf
@@ -26,7 +26,7 @@ _wtf()
 
     COMPREPLY=( $( compgen -W "$( cut -f 1 -s $db ) -f" -- "${cur}" ) )
 } &&
-complete -F _wtf $filenames wtf
+complete -F _wtf -o filenames wtf
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/xmllint b/contrib/xmllint
index ff201ec1..9dce2d42 100644
--- a/contrib/xmllint
+++ b/contrib/xmllint
@@ -45,7 +45,7 @@ _xmllint()
 
     _filedir '@(*ml|htm|svg)'
 } &&
-complete -F _xmllint $filenames xmllint
+complete -F _xmllint -o filenames xmllint
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/xmlwf b/contrib/xmlwf
index de8b7250..3ddbf7b6 100644
--- a/contrib/xmlwf
+++ b/contrib/xmlwf
@@ -29,7 +29,7 @@ _xmlwf()
 
     _filedir '@(*ml|htm|svg)'
 } &&
-complete -F _xmlwf $filenames xmlwf
+complete -F _xmlwf -o filenames xmlwf
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/xmms b/contrib/xmms
index ca49545b..4559c3c7 100644
--- a/contrib/xmms
+++ b/contrib/xmms
@@ -19,7 +19,7 @@ _xmms()
     fi
 
 } &&
-complete -F _xmms $filenames xmms
+complete -F _xmms -o filenames xmms
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/xz b/contrib/xz
index 61899a77..c34c8da8 100644
--- a/contrib/xz
+++ b/contrib/xz
@@ -56,7 +56,7 @@ _xz()
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _xz $filenames xz
+complete -F _xz -o filenames xz
 
 # xzdec(1) completion
 #
@@ -90,7 +90,7 @@ _xzdec()
 
     _filedir xz # no lzma support here as of xz 4.999.8beta
 } &&
-complete -F _xzdec $filenames xzdec
+complete -F _xzdec -o filenames xzdec
 
 # Local variables:
 # mode: shell-script
diff --git a/contrib/yum-arch b/contrib/yum-arch
index 1cc8320c..f28a9da0 100644
--- a/contrib/yum-arch
+++ b/contrib/yum-arch
@@ -19,7 +19,7 @@ _yum_arch()
 
     return 0
 } &&
-complete -F _yum_arch $filenames yum-arch
+complete -F _yum_arch -o filenames yum-arch
 
 # Local variables:
 # mode: shell-script