diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index d53bac29e..e7d944ef0 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-02  Michael Livshin  <mlivshin@bigfoot.com>
+
+	* guile-func-name-check.in: now should not confuse SCO nawk
+	anymore.  thanks to Bruce Korb for the fix!
+
 2000-10-01  Gary Houston  <ghouston@arglist.com>
 
 	* net_db.c: declare inet_aton only if HAVE_INET_ATON is not
diff --git a/libguile/guile-func-name-check.in b/libguile/guile-func-name-check.in
index fcd29b17c..6516e468c 100644
--- a/libguile/guile-func-name-check.in
+++ b/libguile/guile-func-name-check.in
@@ -4,6 +4,7 @@
 
 BEGIN {
   filename = ARGV[1];
+  in_a_func = 0;
 }
 
 /^SCM_DEFINE/ { 
@@ -14,7 +15,7 @@ BEGIN {
   in_a_func = 1;
 }
 
-in_a_func && /^\{/ {
+/^\{/ && in_a_func {
   if (!match(last_line,/^#define[ \t]+FUNC_NAME[ \t]+/)) {
     printf filename ":" NR ":***" > "/dev/stderr";
     print "Missing or erroneous `#define FUNC_NAME s_" func_name "'" > "/dev/stderr";
@@ -39,7 +40,7 @@ in_a_func && /^\{/ {
   next_line_better_be_undef = 0;
 }
 
-in_a_func && /^\}/ {
+/^\}/ && in_a_func {
   next_line_better_be_undef = 1;
 }