diff --git a/ChangeLog b/ChangeLog
index 9ba4cee31..b254825c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-14  qwertial  <qwertial>
+
+	* grub-core/gdb_grub.in: Fix overflow and wrong field.
+
 2013-10-14  Jon McCune <jonmccune@google.com>
 
 	* docs/grub.texi: Document new signatures possibility.
diff --git a/grub-core/gdb_grub.in b/grub-core/gdb_grub.in
index 01ef3e15b..e322d3dc1 100644
--- a/grub-core/gdb_grub.in
+++ b/grub-core/gdb_grub.in
@@ -22,7 +22,7 @@ define dump_module_sections
 	printf "%s", $mod->name
 	set $segment = $mod->segment
 	while ($segment)
-		printf " %i 0x%x", $segment->section, $segment->addr
+		printf " %i 0x%lx", $segment->section, $segment->addr
 		set $segment = $segment->next
 	end
 	printf "\n"
@@ -61,7 +61,7 @@ end
 define load_all_modules
 	set $this = grub_dl_head
 	while ($this != 0)
-		dump_module_sections $this->mod
+		dump_module_sections $this
 		set $this = $this->next
 	end
 	match_and_load_symbols