diff --git a/ChangeLog b/ChangeLog
index b4a308e9a..d40ea54aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/reed_solomon.c (scratch) [! STANDALONE]: Remove leftover
+	variable.
+
 2011-01-04  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/commands/legacycfg.c (GRUB_MOD_INIT): Fix typo in
diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
index 9a40e2f98..740a069ee 100644
--- a/grub-core/lib/reed_solomon.c
+++ b/grub-core/lib/reed_solomon.c
@@ -60,7 +60,9 @@ typedef grub_uint16_t gf_double_t;
 static char *gf_invert __attribute__ ((section(".text"))) = (void *) 0x100000;
 static char *scratch __attribute__ ((section(".text"))) = (void *) 0x100100;
 #else
+#if defined (STANDALONE)
 static char *scratch;
+#endif
 static grub_uint8_t gf_invert[256];
 #endif