diff -r bf1f86bdd79f -r a6a4beab3125 ct-ng.comp
--- a/ct-ng.comp	Fri Mar 05 09:00:07 2010 +0100
+++ b/ct-ng.comp	Fri Apr 02 00:18:26 2010 +0200
@@ -6,8 +6,8 @@
     cur=$(_get_cword)
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    samples=$( ${COMP_WORDS[0]} list-samples 2>/dev/null    \
-               |sed -r -e 's/^(.*) \(host: (.*)\)$/\2,\1/;' \
+    samples=$( "${COMP_WORDS[0]}" list-samples 2>/dev/null  \
+               |tail -n +2 |sed -e '/^ /d; s/ .*//;'        \
              )
     show_samples=$(echo "${samples}" |sed -r -e 's/(^| )/\1show-/g;')
     build_samples=$(echo "${samples}" |sed -r -e 's/(^| )/\1build-/g;')
@@ -22,7 +22,7 @@
              clean distclean wiki-samples updatetools
              tarball version'
 
-    vars="RESTART= STOP="
+    vars="RESTART= STOP= PREFIX= V="
 
     ct_ng_opts="${samples} ${show_samples} ${build_samples}
                 ${steps} ${start_steps} ${stop_steps}