diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9567102043..88b1172121 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* riscv-tdep.c (riscv_push_dummy_call): Use core_addr_to_string_nz
+	where appropriate.
+
 2018-03-06  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* riscv-tdep.c (riscv_print_arg_location): Add header comment,
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 5c04a740df..797ca72a84 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -2121,8 +2121,8 @@ riscv_push_dummy_call (struct gdbarch *gdbarch,
 			      call_info.memory.arg_offset);
 	  fprintf_unfiltered (gdb_stdlog, "Stack required (for refs): 0x%x\n",
 			      call_info.memory.ref_offset);
-	  fprintf_unfiltered (gdb_stdlog, "          Stack allocated: 0x%lx\n",
-			      (osp - sp));
+	  fprintf_unfiltered (gdb_stdlog, "          Stack allocated: %s\n",
+			      core_addr_to_string_nz (osp - sp));
 	}
     }