diff --git a/src/bin/autfilt.cc b/src/bin/autfilt.cc
index 39c896592..2a32627fd 100644
--- a/src/bin/autfilt.cc
+++ b/src/bin/autfilt.cc
@@ -102,6 +102,8 @@ static const argp_option options[] =
       " minuscules for output):", 4 },
     { "%F", 0, 0, OPTION_DOC | OPTION_NO_USAGE,
       "name of the input file", 0 },
+    { "%L", 0, 0, OPTION_DOC | OPTION_NO_USAGE,
+      "location in the input file", 0 },
     { "%S, %s", 0, 0, OPTION_DOC | OPTION_NO_USAGE,
       "number of states", 0 },
     { "%E, %e", 0, 0, OPTION_DOC | OPTION_NO_USAGE,
@@ -324,6 +326,7 @@ namespace
       declare('E', &haut_edges_);
       declare('F', &filename_);
       declare('f', &filename_);	// Override the formula printer.
+      declare('L', &haut_loc_);
       declare('S', &haut_states_);
       declare('T', &haut_trans_);
     }
@@ -338,6 +341,7 @@ namespace
 	  const char* filename, double run_time)
     {
       filename_ = filename;
+      haut_loc_ = haut->loc;
 
       if (has('T'))
 	{
@@ -373,6 +377,7 @@ namespace
     spot::printable_value<unsigned> haut_trans_;
     spot::printable_value<unsigned> haut_acc_;
     spot::printable_value<unsigned> haut_scc_;
+    spot::printable_value<spot::location> haut_loc_;
   };
 
 
diff --git a/src/tgbatest/hoaparse.test b/src/tgbatest/hoaparse.test
index 85497be07..8c7577d5f 100755
--- a/src/tgbatest/hoaparse.test
+++ b/src/tgbatest/hoaparse.test
@@ -26,7 +26,7 @@ set -e
 expecterr()
 {
    cat >$1.exp
-   ../../bin/autfilt --hoa $1 2>$1.err >$1.out && exit 1
+   ../../bin/autfilt --hoa "$@" 2>$1.err >$1.out && exit 1
    test $? = 2
    cat $1.err
    diff $1.err $1.exp
@@ -35,7 +35,7 @@ expecterr()
 expectok()
 {
    cat >$1.exp
-   ../../bin/autfilt --hoa $1 >$1.out
+   ../../bin/autfilt --hoa "$@" >$1.out
    test $? = 0
    cat $1.out
    diff $1.out $1.exp
@@ -383,6 +383,7 @@ cat >input <<EOF
     [!@a & @bc]  0 {1}
     [@a & @bc]   0 {0 1}
     --END--
+/* Some comment */
 HOA: v1
 States: 2
 Start: 0
@@ -425,6 +426,11 @@ State: 1
 --END--
 EOF
 
+expectok input --stats='%F:%L' <<EOF
+input:1.5-16.11
+input:18.1-26.7
+EOF
+
 cat >input <<EOF
 HOA: v1
 --ABORT--