diff --git a/contrib/brctl b/contrib/brctl
index c73718fb..6fd7b6e5 100644
--- a/contrib/brctl
+++ b/contrib/brctl
@@ -41,4 +41,4 @@ _brctl()
 			;;
 	esac
 } &&
-complete -F _brctl brctl
+complete -F _brctl $default brctl
diff --git a/contrib/clisp b/contrib/clisp
index 04317df9..6c6d9b63 100644
--- a/contrib/clisp
+++ b/contrib/clisp
@@ -23,4 +23,4 @@ _clisp()
 
     return 0
 }
-complete -F _clisp -o default clisp
+complete -F _clisp $default clisp
diff --git a/contrib/cowsay b/contrib/cowsay
index f150585f..d9f8bc46 100644
--- a/contrib/cowsay
+++ b/contrib/cowsay
@@ -23,4 +23,4 @@ _cowsay()
 	COMPREPLY=( $( compgen -W '-b -d -g -p -s -t -w -y -e -f -h -l -n -T -W' -- $cur ) )
 
 } &&
-complete -F _cowsay cowsay cowthink
+complete -F _cowsay $default cowsay cowthink
diff --git a/contrib/cpan2dist b/contrib/cpan2dist
index a75e6004..caec18fa 100644
--- a/contrib/cpan2dist
+++ b/contrib/cpan2dist
@@ -42,4 +42,4 @@ _cpan2dist()
 			| awk '{print $1}' | sed -e 's/::/-/g' ) ) 
 	fi
 } &&
-complete -F _cpan2dist cpan2dist
+complete -F _cpan2dist $default cpan2dist
diff --git a/contrib/net-tools b/contrib/net-tools
index 3a2d545b..b52e693b 100644
--- a/contrib/net-tools
+++ b/contrib/net-tools
@@ -55,7 +55,7 @@ _mii-tool()
 		_available_interfaces -a
 	fi
 } &&
-complete -F _mii-tool mii-tool
+complete -F _mii-tool $default mii-tool
 
 have mii-diag &&
 _mii-diag()
@@ -86,4 +86,4 @@ _mii-diag()
 		_available_interfaces -a
 	fi
 } &&
-complete -F _mii-diag mii-diag
+complete -F _mii-diag $default mii-diag
diff --git a/contrib/p4 b/contrib/p4
index 26bf2697..ada8a57f 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -52,4 +52,4 @@ _p4()
 
 	return 0
 }
-complete -F _p4 -o default p4 g4
+complete -F _p4 $default p4 g4
diff --git a/contrib/povray b/contrib/povray
index bb41cabc..c69b0db4 100644
--- a/contrib/povray
+++ b/contrib/povray
@@ -56,4 +56,4 @@ _povray()
     ;;
   esac
 }
-complete -F _povray -o filenames povray xpovray spovray
+complete -F _povray $filenames povray xpovray spovray
diff --git a/contrib/qemu b/contrib/qemu
index 8e159682..7baeddf3 100644
--- a/contrib/qemu
+++ b/contrib/qemu
@@ -97,4 +97,4 @@ _qemu()
 		_filedir
 	fi
 } &&
-complete -F _qemu qemu
+complete -F _qemu $filenames qemu
diff --git a/contrib/sbcl b/contrib/sbcl
index c0320a62..1b14eea3 100644
--- a/contrib/sbcl
+++ b/contrib/sbcl
@@ -22,4 +22,4 @@ _sbcl()
 
     return 0
 }
-complete -F _sbcl -o default sbcl sbcl-mt
+complete -F _sbcl $default sbcl sbcl-mt
diff --git a/contrib/sitecopy b/contrib/sitecopy
index e67eb93b..088951cd 100644
--- a/contrib/sitecopy
+++ b/contrib/sitecopy
@@ -28,4 +28,4 @@ _sitecopy()
 
 	return 0
 }
-complete -F _sitecopy -o default sitecopy
+complete -F _sitecopy $default sitecopy
diff --git a/contrib/svk b/contrib/svk
index d6d290eb..e2d0fac7 100644
--- a/contrib/svk
+++ b/contrib/svk
@@ -260,4 +260,4 @@ _svk()
 
 	return 0
 }
-complete -F _svk -o default svk
+complete -F _svk $default svk
diff --git a/contrib/unace b/contrib/unace
index 567f7014..c6376742 100644
--- a/contrib/unace
+++ b/contrib/unace
@@ -26,4 +26,4 @@ _unace()
 	return 0
 
 }
-complete -F _unace -o filenames unace
+complete -F _unace $filenames unace
diff --git a/contrib/unrar b/contrib/unrar
index 2c4c7dab..9dcd2065 100644
--- a/contrib/unrar
+++ b/contrib/unrar
@@ -26,6 +26,5 @@ _unrar()
 	esac
   
 	return 0
-
 }
-complete -F _unrar -o filenames unrar
+complete -F _unrar $filenames unrar