--- a/Makefile	Wed Dec 29 00:08:03 2010 +0100
+++ b/Makefile	Wed Dec 29 12:02:01 2010 +0100
@@ -9,8 +9,9 @@
 all:	$(ALL)
 
 clean:	
-distclean:
-	rm -f $(CLEANFILES)
+
+distclean:	clean
+	-rm -f $(CLEANFILES)
 
 
 %:	%.pl

--- a/update-serial.pl	Wed Dec 29 00:08:03 2010 +0100
+++ b/update-serial.pl	Wed Dec 29 12:02:01 2010 +0100
@@ -8,9 +8,9 @@
 use File::Basename;
 use Pod::Usage;
 use Getopt::Long;
-use Smart::Comments;
 use File::Temp;
 use POSIX qw(strftime);
+use if $ENV{DEBUG} => "Smart::Comments";
 
 sub uniq(@);
 sub read_conf(@);

--- a/zone-ls.pl	Wed Dec 29 00:08:03 2010 +0100
+++ b/zone-ls.pl	Wed Dec 29 12:02:01 2010 +0100
@@ -8,6 +8,7 @@
 use FindBin;
 use Time::Local;
 use Getopt::Long;
+use if $ENV{DEBUG} => "Smart::Comments";
 
 my %config;
 my $opt_expiry = undef;
@@ -88,7 +89,7 @@
 
         open(my ($fh), $_ = "<$dir/$zone.signed") or die "Can't open $_: $!\n";
         while (<$fh>) {
-            next if not /RSIG.*SOA.*\s
+            next if not /RSIG\s+SOA\s.*\s
 				(?<year>\d\d\d\d)
 				(?<mon>\d\d)
 				(?<day>\d\d)
@@ -100,13 +101,14 @@
         }
     }
 
+
     {    # output
 
         my $sort_by =
           $opt_expiry
           ? sub { ($info{$a}{expiry} // 2**64) <=> ($info{$b}{expiry} // 2**64) }
           : sub { $a cmp $b };
-
+		 
         my $format_h = "%-35s %-8s %1s/%1s %3s %7s\n";
         my $format_l = "%-35s %-8s %1d/%1d %5d %19s\n";
 
@@ -119,6 +121,7 @@
     }
 }
 
+
 __END__
 
 =head1 NAME