diff --git a/ChangeLog b/ChangeLog
index 2e44b4c26..0592459c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Check for __ctzdi2 and __ctzsi2.
+	* include/grub/libgcc.h: Include __ctzdi2 and __ctzsi2 if present.
+
 2011-10-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix few obvious type discrepancies.
diff --git a/configure.ac b/configure.ac
index 9cfbd2340..6aafdf13d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -587,7 +587,7 @@ CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
 fi
 
 # Check for libgcc symbols
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x __ia64_trampoline __udivsi3 __umoddi3 __udivdi3 __divsi3 __modsi3 __umodsi3 __moddi3 __divdi3)
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x __ia64_trampoline __udivsi3 __umoddi3 __udivdi3 __divsi3 __modsi3 __umodsi3 __moddi3 __divdi3 __ctzdi2 __ctzsi2)
 
 if test "x$TARGET_APPLE_CC" = x1 ; then
 CFLAGS="$TARGET_CFLAGS -nostdlib"
diff --git a/include/grub/libgcc.h b/include/grub/libgcc.h
index 19723fd23..7a433dc68 100644
--- a/include/grub/libgcc.h
+++ b/include/grub/libgcc.h
@@ -63,6 +63,12 @@ void EXPORT_FUNC (__divsi3) (void);
 # ifdef HAVE___MODSI3
 void EXPORT_FUNC (__modsi3) (void);
 # endif
+# ifdef HAVE___CTZDI2
+void EXPORT_FUNC (__ctzdi2) (void);
+# endif
+# ifdef HAVE___CTZSI2
+void EXPORT_FUNC (__ctzsi2) (void);
+# endif
 #endif
 
 # ifdef HAVE___IA64_TRAMPOLINE