diff --git a/ChangeLog b/ChangeLog
index 265bbaa51..a0d180f60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* normal/auth.c (punishment_delay): Moved from here ...
+	(grub_auth_strcmp): ... to here (inside function).
+
 2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/list.h (struct grub_named_list): Remove `const'
diff --git a/normal/auth.c b/normal/auth.c
index 41547e33c..c71262584 100644
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -34,7 +34,6 @@ struct grub_auth_user
 };
 
 struct grub_auth_user *users = NULL;
-static unsigned long punishment_delay = 1;
 
 int
 grub_auth_strcmp (const char *s1, const char *s2)
@@ -212,6 +211,7 @@ grub_auth_check_authentication (const char *userlist)
   char login[1024];
   struct grub_auth_user *cur = NULL;
   grub_err_t err;
+  static unsigned long punishment_delay = 1;
 
   auto int hook (grub_list_t item);
   int hook (grub_list_t item)