diff --git a/ChangeLog b/ChangeLog
index 529ab3d71..efa05988e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/libgcrypt_wrap/cipher_wrap.h (WORDS_BIGENDIAN):
+	Restructure to avoid warning.
+
 2011-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-install.in: Account for possible escaped comma in device
diff --git a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
index 0141400fc..5a64c5736 100644
--- a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
+++ b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
@@ -25,10 +25,10 @@
 #include <grub/dl.h>
 #include <grub/crypto.h>
 
-#ifdef GRUB_CPU_WORDS_BIGENDIAN
-#define WORDS_BIGENDIAN
-#else
 #undef WORDS_BIGENDIAN
+
+#ifdef GRUB_CPU_WORDS_BIGENDIAN
+#define WORDS_BIGENDIAN 1
 #endif
 
 #define __GNU_LIBRARY__