diff --git a/ChangeLog b/ChangeLog
index 6b4cc4de8..64c5c5e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
 	* grub-core/gdb/i386/machdep.S: Likewise.
 	* grub-core/gdb/i386/signal.c: Likewise.
 	* grub-core/lib/i386/backtrace.c: Likewise.
+	* grub-core/lib/backtrace.c: Likewise.
 	* include/grub/backtrace.h: Likewise.
 	* include/grub/gdb.h: Likewise.
 	* include/grub/i386/gdb.h: Likewise.
diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
new file mode 100644
index 000000000..bf2f7aa82
--- /dev/null
+++ b/grub-core/lib/backtrace.c
@@ -0,0 +1,48 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/misc.h>
+#include <grub/command.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/mm.h>
+#include <grub/term.h>
+#include <grub/backtrace.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+void
+grub_backtrace_print_address (void *addr)
+{
+  grub_dl_t mod;
+
+  FOR_DL_MODULES (mod)
+  {
+    grub_dl_segment_t segment;
+    for (segment = mod->segment; segment; segment = segment->next)
+      if (segment->addr <= addr && (grub_uint8_t *) segment->addr
+	  + segment->size > (grub_uint8_t *) addr)
+	{
+	  grub_printf ("%s.%x+%" PRIxGRUB_SIZE, mod->name, segment->section,
+		       (grub_uint8_t *) addr - (grub_uint8_t *) segment->addr);
+	  return;
+	}
+  }
+
+  grub_printf ("%p", addr);
+}