diff --git a/ChangeLog b/ChangeLog
index 9c4177de9..5aa1e8630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/error.c: Removed.
+	* grub-core/Makefile.core.def (kernel): Don't add error.c and progname.c
+	explicitly as it's already in libgnu.a.
+
 2013-10-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/osdep/windows/emuconsole.c: Add missing config.h and
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 710fa6b2c..9bdb2bec1 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -238,8 +238,6 @@ kernel = {
   arm = kern/arm/misc.S;
 
   emu = disk/host.c;
-  emu = gnulib/progname.c;
-  emu = kern/emu/error.c;
   emu = kern/emu/cache_s.S;
   emu = kern/emu/hostdisk.c;
   emu = osdep/unix/hostdisk.c;
diff --git a/grub-core/kern/emu/error.c b/grub-core/kern/emu/error.c
deleted file mode 100644
index 559412afc..000000000
--- a/grub-core/kern/emu/error.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <config-util.h>
-#include "../../gnulib/error.c"