diff --git a/ChangeLog b/ChangeLog
index cbd0337ab..5c64e0207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-03  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Add missing files into "make dist" tarball for other platforms.
+
+	* gentpl.py (script): Use dist_noinst_DATA instead of EXTRA_DIST.
+	* conf/Makefile.common (dist_noinst_DATA): New variable.
+	* conf/Makefile.extra-dist: Added missing make dist files.
+	* grub-core/Makefile.core.def: Likewise.
+
 2010-09-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Compress grub_prefix.
diff --git a/conf/Makefile.common b/conf/Makefile.common
index fe14c0e18..fca0f67ae 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -115,6 +115,7 @@ pkglib_SCRIPTS =
 noinst_PROGRAMS =
 grubconf_SCRIPTS =
 noinst_LIBRARIES =
+dist_noinst_DATA =
 
 TESTS =
 EXTRA_DIST =
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 3acef7af7..afedc7d28 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -5,6 +5,11 @@ EXTRA_DIST += gentpl.py
 EXTRA_DIST += Makefile.tpl
 EXTRA_DIST += Makefile.util.def
 
+EXTRA_DIST += unicode
+
+EXTRA_DIST += util/import_gcry.py
+EXTRA_DIST += util/import_unicode.py
+
 EXTRA_DIST += docs/man
 EXTRA_DIST += docs/grub.cfg
 
@@ -26,8 +31,8 @@ EXTRA_DIST += grub-core/genterminallist.sh
 EXTRA_DIST += grub-core/genparttoollist.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh
 
+EXTRA_DIST += grub-core/lib/libgcrypt/cipher
 EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/gnulib -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/efiemu -name '*.h')
-EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/posix_wrap -name '*.h')
-EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/libgcrypt_wrap -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib -name '*.h')
diff --git a/gentpl.py b/gentpl.py
index abfb20444..cd34fccff 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -478,7 +478,7 @@ chmod a+x [+ name +]
 """)
 
     r += gvar_add("CLEANFILES", "[+ name +]")
-    r += gvar_add("EXTRA_DIST", platform_sources(platform))
+    r += gvar_add("dist_noinst_DATA", platform_sources(platform))
     return r
 
 def module_rules():
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 353b9d123..b953adfb9 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -137,6 +137,7 @@ kernel = {
   mips_yeeloong = term/at_keyboard.c;
   mips_yeeloong = term/serial.c;
   mips_yeeloong = video/sm712.c;
+  extra_dist = video/sm712_init.c;
 
   powerpc_ieee1275 = kern/ieee1275/init.c;
   powerpc_ieee1275 = kern/powerpc/cache.S;
@@ -1009,6 +1010,9 @@ module = {
   powerpc = lib/powerpc/relocator_asm.S;
   powerpc = lib/powerpc/relocator.c;
 
+  extra_dist = lib/i386/relocator_common.S;
+  extra_dist = kern/powerpc/cache_flush.S;
+
   enable = mips;
   enable = powerpc;
   enable = x86;