diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd72c384..10c81961 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Dynamic vars whose names contain non-alphanumeric characters are now font-locked correctly.
 * [#445 (comment)](https://github.com/clojure-emacs/clojure-mode/issues/445#issuecomment-340460753): Proper font lock for namespaced keywords like for example `(s/def ::keyword)`
 * [#508](https://github.com/clojure-emacs/clojure-mode/issues/508): Fix font lock for namespaces with metadata
+* [#506](https://github.com/clojure-emacs/clojure-mode/issues/506): `clojure-mode-display-version` correctly displays the package's version
 
 ## 5.10.0 (2019-01-05)
 
diff --git a/clojure-mode.el b/clojure-mode.el
index 9b3ceb28..574edb3a 100644
--- a/clojure-mode.el
+++ b/clojure-mode.el
@@ -81,7 +81,10 @@
   :link '(url-link :tag "GitHub" "https://github.com/clojure-emacs/clojure-mode")
   :link '(emacs-commentary-link :tag "Commentary" "clojure-mode"))
 
-(defconst clojure-mode-version (lm-version)
+(defconst clojure-mode-version
+  (let ((thisbuffer (or load-file-name buffer-file-name)))
+    (with-temp-buffer (insert-file-contents thisbuffer)
+                      (lm-version)))
   "The current version of `clojure-mode'.")
 
 (defface clojure-keyword-face
diff --git a/test/clojure-mode-util-test.el b/test/clojure-mode-util-test.el
index 09ffb414..3d5e0ac1 100644
--- a/test/clojure-mode-util-test.el
+++ b/test/clojure-mode-util-test.el
@@ -26,6 +26,10 @@
 (require 'cl-lib)
 (require 'ert)
 
+
+(ert-deftest clojure-mode-version-should-be-non-nil ()
+  (should (not (eq clojure-mode-version nil))))
+
 (let ((project-dir "/home/user/projects/my-project/")
       (clj-file-path "/home/user/projects/my-project/src/clj/my_project/my_ns/my_file.clj")
       (project-relative-clj-file-path "src/clj/my_project/my_ns/my_file.clj")