diff --git a/ChangeLog b/ChangeLog
index 543a30697..3ba286a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/Makefile.common: Use -freg-struct-return on i386. This
+	decreases code size and improves performance.
+
 2013-10-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/osdep/unix/exec.c: Fix compilation error on emu.
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 727e0645d..91e313dc9 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -7,16 +7,16 @@ unexport LC_ALL
 
 # Platform specific options
 if COND_i386_pc
-  CFLAGS_PLATFORM += -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
 endif
 if COND_i386_qemu
-  CFLAGS_PLATFORM += -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
 endif
 if COND_i386_coreboot
-  CFLAGS_PLATFORM += -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
 endif
 if COND_i386_ieee1275
-  CFLAGS_PLATFORM += -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3 -freg-struct-return
 endif
 if COND_mips_loongson
   CFLAGS_PLATFORM += -mexplicit-relocs