diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror
index 03dc7a9..525b798 100755
--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -9,13 +9,17 @@ mirror for DomUs on Debian and Ubuntu Dom0s.
 
 =head1 SYNOPSIS
 
-  xt-guess-suite-and-mirror [-s] [-m]
-
-  -s  show suite
-  -m  show mirror
+  --suite	Show suite
+  --mirror	Show mirror
 
   Shows both if no parameter is given.
 
+  Help Options:
+
+   --help       Show the help information for this script.
+   --manual     Show the manual for this script.
+   --version    Show the version number and exit.
+
 =cut
 
 =head1 DESCRIPTION
@@ -86,21 +90,20 @@ my $want_mirror  = 0;
 my $want_suite   = 0;
 my $want_version = 0;
 my $want_help    = 0;
-my $want_usage    = 0;
+my $want_manual  = 0;
 
-my $result = GetOptions ('mirror'  => \$want_mirror,
+my $result = GetOptions( 'mirror'  => \$want_mirror,
                          'suite'   => \$want_suite,
                          'version' => \$want_version,
-                         'usage'    => \$want_usage,
-                         'help'    => \$want_help);
+                         'manual'  => \$want_manual,
+                         'help'    => \$want_help );
 
 if ($want_help) {
-    print "Usage: $0 [-m] [-s]\n";
-    exit 0;
+    pod2usage(0);
 }
 
-if ($want_usage) {
-    pod2usage(0);
+if ($want_manual) {
+    pod2usage( -verbose => 2 );
 }
 
 if (-r $sources_list_file) {
diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf
index ca0927b..89206b2 100644
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -130,7 +130,7 @@ memory = 128Mb    # Memory size
 swap   = 128Mb    # Swap size
 # noswap = 1      # Don't use swap at all for the new system.
 fs     = ext3     # use the EXT3 filesystem for the disk image.
-dist   = `xt-guess-suite-and-mirror -s` # Default distribution to install.
+dist   = `xt-guess-suite-and-mirror --suite` # Default distribution to install.
 image  = sparse   # Specify sparse vs. full disk images.
 
 #
@@ -241,7 +241,7 @@ initrd = /boot/initrd.img-`uname -r`
 #
 # The default mirror for debootstrap to install Debian-derived distributions
 #
-mirror = `xt-guess-suite-and-mirror -m`
+mirror = `xt-guess-suite-and-mirror --mirror`
 
 #
 # A mirror suitable for use when installing the Dapper release of Ubuntu.