--- /usr/share/logwatch/scripts/services/named	2009-11-17 15:17:40.000000000 -0500
+++ /etc/logwatch/scripts/services/named	2010-05-22 10:02:54.000000000 -0400
@@ -213,6 +213,7 @@
       ($ThisLine =~ /.*: unexpected end of input/) or
       ($ThisLine =~ /too many timeouts resolving '.*' .*: disabling EDNS/) or
       ($ThisLine =~ /too many timeouts resolving '.*' .*: reducing the advertised EDNS UDP packet size to .* octets/) or
+      ($ThisLine =~ /success resolving '.*' \(in '.*'\?\) after reducing the advertised EDNS UDP packet size to 512 octets/) or
       ($ThisLine =~ /reloading zones succeeded/)
       # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
    ) {
@@ -298,11 +299,13 @@
       $MasterFailure{"$Zone from $Host"}{$Reason}++;
    } elsif ( ($Zone) = ($ThisLine =~ /zone ([^\/]+)\/.+: refresh: non-authoritative answer from master/)) {
       $NonAuthoritative{$Zone}++;
-   } elsif ( ($ThisLine =~ /unexpected RCODE \((.*)\) resolving/) ){
+   } elsif ( ($ThisLine =~ /\(?unexpected RCODE \(?(.*)\) resolving/) ){
       $UnexpRCODE{$1}++;
-   } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [0-9.#]+/) ) {
+   } elsif ( ($ThisLine =~ /\(?FORMERR\)? resolving '[^ ]+: [0-9.#]+/) ) {
       chomp($ThisLine);
       $FormErr{$ThisLine}++;
+   } elsif (($Address,$Type) = ($ThisLine =~ /DNS format error from [0-9\.#]+ resolving/)) {
+      $FormErr{$ThisLine}++;
    } elsif ( ($ThisLine =~ /found [0-9]* CPU(s)?, using [0-9]* worker thread(s)?/) ) {
       chomp($ThisLine);
       $StartLog{$ThisLine}++;
@@ -324,9 +327,9 @@
       $UnknownCCCommands{$CCC}++;
    } elsif (($CCC) = ($ThisLine =~ /received control channel command '(.*)'/)) {
       $CCCommands{$CCC}++;
-   } elsif (($Name,$Address) = ($ThisLine =~ /network unreachable resolving '(.*)': (.*)/)) {
+   } elsif (($Name,$Address) = ($ThisLine =~ /\(?network unreachable\)? resolving '(.*)': (.*)/)) {
       $NUR{$Name}{$Address}++;
-   } elsif (($Name,$Address) = ($ThisLine =~ /host unreachable resolving '(.*)': (.*)/)) {
+   } elsif (($Name,$Address) = ($ThisLine =~ /\(?host unreachable\)? resolving '(.*)': (.*)/)) {
       $HUR{$Name}{$Address}++;
    } else {
       # Report any unmatched entries...