diff --git a/src/disassembler.cc b/src/disassembler.cc
index 8a1303a..f81ec8d 100644
--- a/src/disassembler.cc
+++ b/src/disassembler.cc
@@ -272,7 +272,7 @@ Disassembler::receive_instruction_styled_text (void *context,
 }
 
 void
-Disassembler::print_address (unsigned long address, disassemble_info *info)
+Disassembler::print_address (bfd_vma address, disassemble_info *info)
 {
-  info->fprintf_func (info->stream, "0x%lx", address);
+  info->fprintf_func (info->stream, "0x%llx", (unsigned long long)address);
 }
diff --git a/src/disassembler.h b/src/disassembler.h
index 88f7ce7..7a98333 100644
--- a/src/disassembler.h
+++ b/src/disassembler.h
@@ -65,7 +65,7 @@ class Disassembler
   static int receive_instruction_text (void *context, const char *fmt, ...);
   static int receive_instruction_styled_text (void *context,
 		enum disassembler_style style, const char *fmt, ...);
-  static void print_address (unsigned long address, disassemble_info *info);
+  static void print_address (bfd_vma address, disassemble_info *info);
   
 public:
   Disassembler (void);