diff --git a/ChangeLog b/ChangeLog
index 15fd56227..6fd2366b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2013-06-02  Francesco Lavra  <francescolavra.fl@gmail.com>
+2013-06-07  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	Fix make dist on non-pc.
+
+2013-06-07  Francesco Lavra  <francescolavra.fl@gmail.com>
 
 	* grub-core/kern/corecmd.c (grub_core_cmd_ls): Fix handling of paths
 	without a device name.
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index c0441d2b3..e0fc14db1 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -45,9 +45,9 @@ gensm712: video/sm712.c
 CLEANFILES += gensm712
 
 # trigtables.c
-sm712_start.S: gensm712 video/sm712.c $(top_srcdir)/configure.ac
+sm712_start.h: gensm712 video/sm712.c $(top_srcdir)/configure.ac
 	$(builddir)/gensm712 > $@
-CLEANFILES += sm712_start.S
+CLEANFILES += sm712_start.h
 
 # XXX Use Automake's LEX & YACC support
 grub_script.tab.h: script/parser.y
@@ -60,12 +60,9 @@ grub_script.yy.h: script/yylex.l
 	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $<
 grub_script.yy.c: grub_script.yy.h
 
-rs_decoder.S: $(srcdir)/lib/reed_solomon.c
+rs_decoder.h: $(srcdir)/lib/reed_solomon.c
 	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Os -I$(top_builddir) -S -DSTANDALONE -o $@ $< -g0 -mregparm=3 -ffreestanding
 
-boot/i386/pc/startup_raw.S: $(builddir)/rs_decoder.S
-boot/mips/loongson/fwstart.S: $(builddir)/sm712_start.S
-
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 include $(srcdir)/Makefile.core.am
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 6c98a01de..6aeb79b59 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -394,6 +394,7 @@ image = {
 image = {
   name = lzma_decompress;
   i386_pc = boot/i386/pc/startup_raw.S;
+  i386_pc_nodist = rs_decoder.h;
 
   objcopyflags = '-O binary';
   ldflags = '$(TARGET_IMG_LDFLAGS) $(TARGET_IMG_BASE_LDOPT),0x8200';
@@ -403,6 +404,7 @@ image = {
 image = {
   name = fwstart;
   mips_loongson = boot/mips/loongson/fwstart.S;
+  mips_loongson_nodist = sm712_start.h;
   objcopyflags = '-O binary';
   ldflags = '-static-libgcc -lgcc -Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic';
   enable = mips_loongson;
diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S
index 81c0bc457..06dec8c06 100644
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -119,7 +119,7 @@ LOCAL (codestart):
 
 #include "../../../kern/i386/realmode.S"
 
-#include <rs_decoder.S>
+#include <rs_decoder.h>
 
 	.text
 
diff --git a/grub-core/boot/mips/loongson/fwstart.S b/grub-core/boot/mips/loongson/fwstart.S
index ec57be6a1..11ad1c91a 100644
--- a/grub-core/boot/mips/loongson/fwstart.S
+++ b/grub-core/boot/mips/loongson/fwstart.S
@@ -886,7 +886,7 @@ table_cont:
 	b init_end
 	  nop
 init_table:	
-#include "sm712_start.S"
+#include "sm712_start.h"
 init_table_end:
 	.align 4
 init_end: