diff --git a/ChangeLog b/ChangeLog
index 98418f4a0..cdf602203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/bus/cs5536.c: Don't include grub/machine/kernel.h on
+	non-loongson.
+	* grub-core/kern/mips/dl.c (grub_arch_dl_init_linker): Fix argument
+	to grub_dl_register_symbol.
+
 2011-05-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix compilation errors.
diff --git a/grub-core/bus/cs5536.c b/grub-core/bus/cs5536.c
index ae3c5c878..58ffeb60a 100644
--- a/grub-core/bus/cs5536.c
+++ b/grub-core/bus/cs5536.c
@@ -21,7 +21,9 @@
 #include <grub/pci.h>
 #include <grub/time.h>
 #include <grub/ata.h>
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
 #include <grub/machine/kernel.h>
+#endif
 
 #include <grub/dl.h>
 
diff --git a/grub-core/kern/mips/dl.c b/grub-core/kern/mips/dl.c
index e17e9f30b..2ddbed3e6 100644
--- a/grub-core/kern/mips/dl.c
+++ b/grub-core/kern/mips/dl.c
@@ -234,6 +234,6 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 void 
 grub_arch_dl_init_linker (void)
 {
-  grub_dl_register_symbol ("__gnu_local_gp", &__gnu_local_gp_dummy, 0);
+  grub_dl_register_symbol ("__gnu_local_gp", &__gnu_local_gp_dummy, 0, 0);
 }