diff --git a/ChangeLog b/ChangeLog
index ec0c2a1c7..893a21c06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-26  Pavel Roskin  <proski@gnu.org>
 
+	* genmk.rb: Avoid shadowing variable `s', rename the outer `s'
+	to `str'.
+
 	* util/getroot.c (grub_util_get_dev_abstraction): Mark os_dev as
 	possibly unused.
 
diff --git a/genmk.rb b/genmk.rb
index 3532cd876..abdb8ca6b 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -304,20 +304,20 @@ print l
 print "# Generated by genmk.rb, please don't edit!\n"
 
 cont = false
-s = nil
+str = nil
 while l = gets
   if cont
-    s += l
+    str += l
   else
-    s = l
+    str = l
   end
 
   print l
   cont = (/\\$/ =~ l)
   unless cont
-    s.gsub!(/\\\n/, ' ')
+    str.gsub!(/\\\n/, ' ')
     
-    if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ s
+    if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ str
       var, args = $1, $2
 
       if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/