diff --git a/MAVSDK_SERVER_VERSION b/MAVSDK_SERVER_VERSION
index 1defe531..a4b6ac3d 100644
--- a/MAVSDK_SERVER_VERSION
+++ b/MAVSDK_SERVER_VERSION
@@ -1 +1 @@
-v2.1.0
+v2.2.0
diff --git a/setup.py b/setup.py
index 097f2960..ff704d3f 100644
--- a/setup.py
+++ b/setup.py
@@ -120,11 +120,14 @@ def download_mavsdk_server(self):
 def version():
     process = subprocess.Popen(["git", "describe", "--tags"],
                                stdout=subprocess.PIPE)
-    (output, err) = process.communicate()
+    output, _ = process.communicate()
     exit_code = process.wait()
     if exit_code != 0:
         raise RuntimeError(f"git describe command exited with: {exit_code}")
-    return output.decode("utf-8").strip()
+    git_describe_str = output.decode("utf-8").strip()
+    git_describe_str = git_describe_str.replace("-g", "+g")
+    print(git_describe_str)
+    return git_describe_str
 
 
 setup(