diff --git a/scripts/buildcommands.py b/scripts/buildcommands.py
index b35873840..68fbc7962 100644
--- a/scripts/buildcommands.py
+++ b/scripts/buildcommands.py
@@ -483,8 +483,17 @@ def git_version():
     logging.debug("Got git version: %s" % (repr(ver),))
     return ver
 
+# Obtain version info from "klippy/.version" file
+def file_version():
+    if not os.path.exists('klippy/.version'):
+        logging.debug("No 'klippy/.version' file/directory found")
+        return ""
+    ver = check_output("cat klippy/.version").strip()
+    logging.debug("Got klippy version: %s" % (repr(ver),))
+    return ver
+
 def build_version(extra, cleanbuild):
-    version = git_version()
+    version = git_version() or file_version()
     if not version:
         cleanbuild = False
         version = "?"