diff --git a/ChangeLog b/ChangeLog
index e5f9f068d..943c43372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/gnulib/regcomp.c (regerror): Don't use abort on
+	unexpected error.
+	(optimize_utf8): Likewise.
+	* grub-core/lib/posix_wrap/stdlib.h (abort): Removed.
+
 2012-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/boot/i386/pc/lnxboot.S: Use
diff --git a/grub-core/gnulib/regcomp.c b/grub-core/gnulib/regcomp.c
index 23f3afa01..d153e3c2e 100644
--- a/grub-core/gnulib/regcomp.c
+++ b/grub-core/gnulib/regcomp.c
@@ -555,7 +555,7 @@ regerror (int errcode, const regex_t *_Restrict_ preg,
        to this routine.  If we are given anything else, or if other regex
        code generates an invalid error code, then the program has a bug.
        Dump core so we can fix it.  */
-    abort ();
+    msg = "unknown regexp error";
 
   msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
 
@@ -1119,7 +1119,7 @@ optimize_utf8 (re_dfa_t *dfa)
 	}
 	break;
       default:
-	abort ();
+	break;
       }
 
   if (mb_chars || has_period)
diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
index 7cfc63a51..31fe055a7 100644
--- a/grub-core/lib/posix_wrap/stdlib.h
+++ b/grub-core/lib/posix_wrap/stdlib.h
@@ -46,10 +46,4 @@ realloc (void *ptr, grub_size_t size)
   return grub_realloc (ptr, size);
 }
 
-static inline void __attribute__ ((noreturn))
-abort (void)
-{
-  grub_abort ();
-}
-
 #endif