diff --git a/ChangeLog b/ChangeLog
index 9df444755..ce28aed16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* configure.ac: Check for `__ashldi3', `__ashrdi3', `__lshrdi3',
+	`__trampoline_setup' and `__ucmpdi2'.
+	* include/grub/powerpc/libgcc.h: Only export symbols for functions
+	that libgcc provides.
+
 2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/powerpc/libgcc.h (memset): Remove function prototype.
diff --git a/configure.ac b/configure.ac
index bf113ba68..048333ba5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -412,7 +412,7 @@ AC_SUBST(TARGET_CPPFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 
 # Check for libgcc symbols (must be performed before we add -nostdlib to LDFLAGS)
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2)
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2)
 
 # Set them to their new values for the tests below.
 CC="$TARGET_CC"
diff --git a/include/grub/powerpc/libgcc.h b/include/grub/powerpc/libgcc.h
index c32fcd87f..452ad4366 100644
--- a/include/grub/powerpc/libgcc.h
+++ b/include/grub/powerpc/libgcc.h
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2004,2007,2009  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,8 +16,20 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
+#ifdef HAVE___ASHLDI3
 void EXPORT_FUNC (__ashldi3) (void);
+#endif
+#ifdef HAVE___ASHRDI3
 void EXPORT_FUNC (__ashrdi3) (void);
+#endif
+#ifdef HAVE___LSHRDI3
 void EXPORT_FUNC (__lshrdi3) (void);
+#endif
+#ifdef HAVE___TRAMPOLINE_SETUP
 void EXPORT_FUNC (__trampoline_setup) (void);
+#endif
+#ifdef HAVE___UCMPDI2
 void EXPORT_FUNC (__ucmpdi2) (void);
+#endif