diff --git a/ChangeLog b/ChangeLog
index a448d7c335..21071e35d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* scripts/soversions.awk: Only record first WORDSIZE{32,64}
+	matching line.
+
 2005-02-11  Roland McGrath  <roland@redhat.com>
 
 	[BZ #715]
diff --git a/scripts/soversions.awk b/scripts/soversions.awk
index eab2e17677..32ce076ba9 100644
--- a/scripts/soversions.awk
+++ b/scripts/soversions.awk
@@ -8,7 +8,7 @@ BEGIN {
 { thiscf = $1 }
 
 $2 ~ /WORDSIZE[3264]/ {
-  if (config ~ thiscf) {
+  if ((config ~ thiscf) && !othercf) {
     othercf = $3;
     sub(/@CPU@/, cpu, othercf);
     sub(/@VENDOR@/, vendor, othercf);