diff --git a/ChangeLog b/ChangeLog
index d83d10a65..8a1659121 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2013-01-11  Vladimir Serbinenko  <phcoder@gmail.com>
+2013-01-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/libgcrypt_wrap/mem.c (_gcry_log_bug): Make gcrypt bugs
+	fatal.
+
+2013-01-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* autogen.sh: Do not try to delete nonexistant files.
 	* util/import_gcrypth.sed: Add some missing header removals.
diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c
index a9f0afffc..64e8b6275 100644
--- a/grub-core/lib/libgcrypt_wrap/mem.c
+++ b/grub-core/lib/libgcrypt_wrap/mem.c
@@ -95,6 +95,7 @@ void _gcry_log_bug (const char *fmt, ...)
   grub_vprintf (fmt, args);
   va_end (args);
   grub_refresh ();
+  grub_abort ();
 }
 
 gcry_err_code_t