diff --git a/ChangeLog b/ChangeLog
index 4ca26dbcd..bb9c120a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/libgcrypt_wrap/cipher_wrap.h (__GNU_LIBRARY__): Avoid
+	rimplicit redifinition.
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Internationalisation): Detail (lack of) collation in
diff --git a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
index 828530577..70c0fb430 100644
--- a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
+++ b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
@@ -31,7 +31,8 @@
 #define WORDS_BIGENDIAN 1
 #endif
 
-#define __GNU_LIBRARY__
+#undef __GNU_LIBRARY__
+#define __GNU_LIBRARY__ 1
 
 #define DIM ARRAY_SIZE