Index: ./httpd/cgi-bin/check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.673
diff -u -r1.673 check
--- ./httpd/cgi-bin/check	30 Jun 2009 18:49:07 -0000	1.673
+++ ./httpd/cgi-bin/check	24 Jul 2009 00:37:16 -0000
@@ -534,14 +534,14 @@
   my ($override, undef) = split(/\s/, $File->{Opt}->{Charset}, 2);
   $File->{Charset}->{Override} = lc($override);
 
-  if ($File->{Opt}->{FB}->{Charset}) { # charset fallback mode
+  if ($File->{Opt}->{FB}->{Charset} and $File->{DOCTYPE} ne "HTML5") { # charset fallback mode
     unless ($File->{Charset}->{Use}) { # no charset detected, actual fallback
       &add_warning('W02', {W02_charset => $File->{Charset}->{Override}});
       $File->{Tentative} |= T_ERROR; # Tag it as Invalid.
       $File->{Charset}->{Use} = $File->{Charset}->{Override};
     }
   } else { # charset "hard override" mode
-    if (! $File->{Charset}->{Use}) { # overriding "nothing"
+    if (! $File->{Charset}->{Use} and $File->{DOCTYPE} ne "HTML5") { # overriding "nothing"
       &add_warning('W04', {W04_charset => $File->{Charset}->{Override}, W04_override => TRUE});
       $File->{Tentative} |= T_ERROR;
       $File->{Charset}->{Use} = $File->{Charset}->{Override};