diff --git a/ChangeLog b/ChangeLog
index 7c2b55e3b..b0a790c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/x86_64/dl.c (grub_arch_dl_relocate_symbols): Issue
+	an error and not a fatal on unrecognised relocation types.
+
 2011-11-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/ieee1275/openfw.c (grub_ieee1275_parse_args):
diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
index 090ad78b8..9b63b30f8 100644
--- a/grub-core/kern/x86_64/dl.c
+++ b/grub-core/kern/x86_64/dl.c
@@ -109,7 +109,9 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
                     break;
 
                   default:
-                    grub_fatal ("Unrecognized relocation: %d\n", ELF_R_TYPE (rel->r_info));
+		    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+				       "this relocation (%d) is not implemented yet",
+				       ELF_R_TYPE (rel->r_info));
 		  }
 	      }
 	  }