diff --git a/ChangeLog b/ChangeLog
index 3c09c50e5..fb8e24889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/geli.c (geli_rekey): Fix error return type.
+
 2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/usbms.c (grub_usbms_cbi_cmd): Fix error type.
diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
index c4864dc1b..305072778 100644
--- a/grub-core/disk/geli.c
+++ b/grub-core/disk/geli.c
@@ -153,7 +153,7 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno)
   gcry_err = grub_crypto_hmac_buffer (dev->hash, dev->rekey_key, 64,
 				      &tohash, sizeof (tohash), key);
   if (gcry_err)
-    return grub_crypto_gcry_error (gcry_err);
+    return gcry_err;
 
   return grub_cryptodisk_setkey (dev, (grub_uint8_t *) key,
 				 dev->rekey_derived_size);