diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index f5da75d70f..a9166debf1 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (READ_ULEB): Use DWARF_VMA_FMT to report error.
+	(READ_SLEB): Likewise.
+
 2017-06-21  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/21648
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index ee464391e1..5195f8d6b5 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -323,7 +323,7 @@ read_uleb128 (unsigned char * data,
 								\
       (var) = _val = read_uleb128 (start, &length_return, end);	\
       if ((var) != _val)					\
-	error (_("Internal error: %s%d: LEB value (%#lx) too large for containing variable\n"),	\
+	error (_("Internal error: %s%d: LEB value (%#" DWARF_VMA_FMT "x) too large for containing variable\n"),	\
 	       __FILE__, __LINE__, _val);			\
       start += length_return;					\
     }								\
@@ -336,7 +336,7 @@ read_uleb128 (unsigned char * data,
 								\
       (var) = _val = read_sleb128 (start, &length_return, end);	\
       if ((var) != _val)					\
-	error (_("Internal error: %s%d: LEB value (%#lx) too large for containing variable\n"),	\
+	error (_("Internal error: %s%d: LEB value (%#" DWARF_VMA_FMT "x) too large for containing variable\n"),	\
 	       __FILE__, __LINE__, _val);			\
       start += length_return;					\
     }								\