diff --git a/src/octoprint/server/api/__init__.py b/src/octoprint/server/api/__init__.py
index 9ff5ae54..7e886e7a 100644
--- a/src/octoprint/server/api/__init__.py
+++ b/src/octoprint/server/api/__init__.py
@@ -30,6 +30,8 @@ from . import users as api_users
 from . import log as api_logs
 
 
+VERSION = "1.0"
+
 #~~ first run setup
 
 
@@ -69,6 +71,14 @@ def apiPrinterState():
 	return jsonify(currentData)
 
 
+@api.route("/version", methods=["GET"])
+@restricted_access
+def apiVersion():
+	return jsonify({
+		"server": octoprint.server.VERSION,
+		"api": octoprint.server.api.VERSION
+	})
+
 #~~ system control