diff --git a/ChangeLog b/ChangeLog
index 20c916222..8c8d8919f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Use define for defining
+	memset rather than inline static function.
+
 2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/xzembed/xz_config.h: Enable all bcj filters when
diff --git a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
index f537d50b2..7d7c7c672 100644
--- a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
+++ b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
@@ -52,15 +52,9 @@ fips_mode (void)
 }
 
 #ifdef GRUB_UTIL
-#pragma GCC diagnostic ignored "-Wshadow"
 
-static inline void *
-memset (void *s, int c, grub_size_t n)
-{
-  return grub_memset (s, c, n);
-}
+#define memset grub_memset
 
-#pragma GCC diagnostic error "-Wshadow"
 #endif