diff --git a/bin/gen-version b/bin/gen-version
new file mode 100755
index 0000000..8f622b8
--- /dev/null
+++ b/bin/gen-version
@@ -0,0 +1,29 @@
+#!/bin/sh
+# -*- coding: utf-8 -*-
+#
+# 2019 Nico Schottelius (nico-ucloud at schottelius.org)
+#
+# This file is part of ucloud.
+#
+# ucloud is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# ucloud is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ucloud. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+
+# Wrapper for real script to allow execution from checkout
+dir=${0%/*}
+
+# Ensure version is present - the bundled/shipped version contains a static version,
+# the git version contains a dynamic version
+printf "VERSION = \"%s\"\n" "$(git describe)" > ${dir}/../ucloud/version.py
diff --git a/bin/ucloud b/bin/ucloud
index e178413..ba337fd 100755
--- a/bin/ucloud
+++ b/bin/ucloud
@@ -25,7 +25,7 @@ dir=${0%/*}
 
 # Ensure version is present - the bundled/shipped version contains a static version,
 # the git version contains a dynamic version
-printf "VERSION = \"%s\"\n" "$(git describe)" > ${dir}/../ucloud/version.py
+${dir}/gen-version
 
 libdir=$(cd "${dir}/../" && pwd -P)
 export PYTHONPATH="${libdir}"
diff --git a/setup.py b/setup.py
index 9a35f27..14dffb7 100644
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,17 @@ from setuptools import setup, find_packages
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
+try:
+    import ucloud.version
+    version = ucloud.version.VERSION
+except:
+    import subprocess
+    c = subprocess.run(["git", "describe"], capture_output=True)
+    version = c.stdout.decode("utf-8")
+
+
 setup(name='ucloud',
-      version='0.0.1',
+      version=version,
       description='All ucloud server components.',
       url='https://code.ungleich.ch/ucloud/ucloud',
       long_description=long_description,