diff --git a/ChangeLog b/ChangeLog
index 744f6189f..1833a44c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/Makefile.am (rs_decoder.S): Add missing -ffreestanding.
+
 2012-06-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-probe.c (escape_of_path): Fix double free.
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 4d8096dfa..07918dbea 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -52,7 +52,7 @@ grub_script.yy.h: script/yylex.l
 grub_script.yy.c: grub_script.yy.h
 
 rs_decoder.S: $(srcdir)/lib/reed_solomon.c
-	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3
+	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
 
 kern/i386/pc/startup.S: $(builddir)/rs_decoder.S