diff --git a/ChangeLog b/ChangeLog
index e66c70077..2f635990c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-09-14  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	From Hollis Blanchard <hollis@penguinppc.org>:
+	* kern/misc.c (memmove): New alias for grub_memmove.
+	(memcmp): New alias for grub_memcmp.
+	(memset): New alias for grub_memset.
+	* boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_get_property): 
+	Change "int handle" to "grub_ieee1275_phandle_t handle".
+	* include/grub/powerpc/ieee1275/ieee1275.h 
+	(grub_ieee1275_get_property): Likewise.
+	
 2004-09-12  Tomas Ebenlendr  <ebik@ucw.cz>
 
 	Added normal mode command `chainloader' as module chain.mod, which
diff --git a/THANKS b/THANKS
index 5b851be28..c84c6ba59 100644
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ The following people made especially gracious contributions of their
 time and energy in helping to track down bugs, add new features, and
 generally assist in the GRUB 2 maintainership process:
 
+Hollis Blanchard <hollis@penguinppc.org>
 NIIBE Yutaka <gniibe@m17n.org>
 Tsuneyoshi Yasuo <tuneyoshi@naic.co.jp>
 
diff --git a/boot/powerpc/ieee1275/ieee1275.c b/boot/powerpc/ieee1275/ieee1275.c
index 580e82984..1658687fb 100644
--- a/boot/powerpc/ieee1275/ieee1275.c
+++ b/boot/powerpc/ieee1275/ieee1275.c
@@ -75,7 +75,8 @@ grub_ieee1275_finddevice (char *name, grub_ieee1275_phandle_t *phandlep)
 }
 
 int
-grub_ieee1275_get_property (int handle, const char *property, void *buf,
+grub_ieee1275_get_property (grub_ieee1275_phandle_t handle,
+			    const char *property, void *buf,
 			    grub_size_t size, grub_size_t *actual)
 {
   struct get_property_args {
diff --git a/include/grub/powerpc/ieee1275/ieee1275.h b/include/grub/powerpc/ieee1275/ieee1275.h
index ef3bb80c7..b58f49df6 100644
--- a/include/grub/powerpc/ieee1275/ieee1275.h
+++ b/include/grub/powerpc/ieee1275/ieee1275.h
@@ -49,8 +49,9 @@ extern intptr_t (*grub_ieee1275_entry_fn) (void *);
 uint32_t EXPORT_FUNC(grub_ieee1275_decode_int_4) (unsigned char *p);
 int EXPORT_FUNC(grub_ieee1275_finddevice) (char *name,
 					   grub_ieee1275_phandle_t *phandlep);
-int EXPORT_FUNC(grub_ieee1275_get_property) (int handle, const char *property,
-					     void *buf, grub_size_t size,
+int EXPORT_FUNC(grub_ieee1275_get_property) (grub_ieee1275_phandle_t handle,
+					     const char *property, void *buf,
+					     grub_size_t size,
 					     grub_size_t *actual);
 int EXPORT_FUNC(grub_ieee1275_next_property) (int handle, char *prev_prop,
 					      char *prop, int *flags);
diff --git a/kern/misc.c b/kern/misc.c
index 36604ac68..df1e7bade 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -45,6 +45,8 @@ grub_memmove (void *dest, const void *src, grub_size_t n)
   
   return dest;
 }
+void *memmove (void *dest, const void *src, grub_size_t n)
+  __attribute__ ((alias ("grub_memmove")));
 /* GCC emits references to memcpy() for struct copies etc.  */
 void *memcpy (void *dest, const void *src, grub_size_t n)
   __attribute__ ((alias ("grub_memmove")));
@@ -134,6 +136,8 @@ grub_memcmp (const void *s1, const void *s2, grub_size_t n)
 
   return 0;
 }
+void *memcmp (const void *s1, const void *s2, grub_size_t n)
+  __attribute__ ((alias ("grub_memcmp")));
 
 int
 grub_strcmp (const char *s1, const char *s2)
@@ -359,6 +363,8 @@ grub_memset (void *s, int c, grub_size_t n)
 
   return s;
 }
+void *memset (void *s, int c, grub_size_t n)
+  __attribute__ ((alias ("grub_memset")));
 
 grub_size_t
 grub_strlen (const char *s)