diff --git a/ChangeLog b/ChangeLog
index a6f53c1076..286f58be42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-01  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/conformtest.pl: Handle "symbol" lines for allow-header.
+
 	* Makeconfig (localtime): Remove variable.
 	(inst_localtime-file): Likewise.
 
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 8b951867cc..a14aa09eeb 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -1075,6 +1075,8 @@ while ($#headers >= 0) {
 	push @allow, $4;
       } elsif (/^macro *([^	]*)/) {
 	push @allow, $1;
+      } elsif (/^symbol *([a-zA-Z0-9_]*) *([A-Za-z0-9_-]*)?/) {
+	push @allow, $1;
       } elsif (/^allow-header *(.*)/) {
 	if ($seenheader{$1} != 1) {
 	  push @allowheader, $1;