diff -r 2c0ed9ec9a8c -r bf1f86bdd79f ct-ng.comp
--- a/ct-ng.comp	Thu Feb 11 21:28:10 2010 +0100
+++ b/ct-ng.comp	Fri Mar 05 09:00:07 2010 +0100
@@ -6,7 +6,9 @@
     cur=$(_get_cword)
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    samples=$(${COMP_WORDS[0]} list-samples 2>/dev/null)
+    samples=$( ${COMP_WORDS[0]} list-samples 2>/dev/null    \
+               |sed -r -e 's/^(.*) \(host: (.*)\)$/\2,\1/;' \
+             )
     show_samples=$(echo "${samples}" |sed -r -e 's/(^| )/\1show-/g;')
     build_samples=$(echo "${samples}" |sed -r -e 's/(^| )/\1build-/g;')