diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 767a6337c82..f1e1f9bd3f2 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-04  Tom Tromey  <tom@tromey.com>
+
+	* dwarf-mode.el (dwarf-browse): Set default-directory.  Bump
+	version number.
+
 2016-11-04  Palmer Dabbelt <palmer@dabbelt.com>
 
 	* MAINTAINERS: Add myself and Andrew Waterman as maintainers for
diff --git a/binutils/dwarf-mode.el b/binutils/dwarf-mode.el
index 407c49b8e29..cec56ec1629 100644
--- a/binutils/dwarf-mode.el
+++ b/binutils/dwarf-mode.el
@@ -1,6 +1,6 @@
 ;;; dwarf-mode.el --- Browser for DWARF information.
 
-;; Version: 1.2
+;; Version: 1.3
 
 ;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
 
@@ -162,6 +162,7 @@ This is the main interface to `dwarf-mode'."
 	 (buffer (generate-new-buffer (concat "*DWARF for " base-name "*"))))
     (pop-to-buffer buffer)
     (dwarf-mode)
+    (setq default-directory (file-name-directory file))
     (set (make-local-variable 'dwarf-file) file)
     (dwarf-do-refresh)))