Index: /shepherd
===================================================================
--- /shepherd (revision 179)
+++ /shepherd (revision 180)
@@ -146,12 +146,14 @@
 # ---------------------------------------------------------------------------
 
-$| = 1;
-
-print ucfirst($progname) . " v$version\n\n";
-
 # Any options Shepherd doesn't understand, we'll pass to the grabber(s)
 Getopt::Long::Configure(qw/pass_through/);
 
 &get_initial_command_line_options;
+
+&capabilities if ($opt->{capabilities});
+&description if ($opt->{description});
+
+$| = 1; 
+print ucfirst($progname) . " v$version\n\n";
 
 &help if ($opt->{help});
@@ -1955,4 +1957,10 @@
 	      'clearpreftitle'  => \$opt->{clearpreftitlesource},
 	      'dontcallgrabbers' => \$opt->{dontcallgrabbers},
+	      
+	      # http://xmltv.org/wiki/xmltvcapabilities.html
+	      'capabilities'	=> \$opt->{capabilities},
+	      'description'	=> \$opt->{description},
+	      'quiet'		=> \$opt->{quiet},
+
               'debug'           => \$debug);
 }
@@ -2315,4 +2323,16 @@
 }
 
+sub capabilities
+{
+    print "baseline\nmanualconfig\n";
+    exit 0;
+}
+
+sub description
+{
+    print "Australia\n";
+    exit 0;
+}
+
 sub help
 {
@@ -2339,4 +2359,6 @@
 
     --check               Check status of all grabbers and postprocessors
+
+    --capabilities        Report capabilities to XMLTV
 
     --nolog               Don't write a logfile