--- gentoo.old	2010-06-13 10:34:53.811003374 +0200
+++ gentoo	2010-06-13 11:07:08.730810168 +0200
@@ -700,8 +700,9 @@
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
 
-    opts="help setup clean fetch digest manifest unpack compile test preinst \
-        install postinst qmerge merge unmerge prerm postrm config package rpm"
+    opts="config info pretend setup unpack prepare configure compile test \
+        install preinst postinst prerm postrm help depend fetch fetchall \
+        digest manifest qmerge merge unmerge clean cleanrm package rpm"
 
     if [[ $COMP_CWORD -eq 1 ]] ; then
     COMPREPLY=($(compgen -f -X "!*.ebuild" -- ${cur}) \