diff --git a/tools/marvin/mvn-setup.py b/tools/marvin/mvn-setup.py
index 61bd2219238..cabcf0dc659 100755
--- a/tools/marvin/mvn-setup.py
+++ b/tools/marvin/mvn-setup.py
@@ -34,6 +34,8 @@ def replaceVersion(fname, version):
     with open(fname, 'r') as f:
         content = f.read()
     needle = '\nVERSION\s*=\s*[\'"][^\'"]*[\'"]'
+    # Ensure the version is PEP440 compliant
+    version = version.replace('-', '+', 1)
     replacement = '\nVERSION = "%s"' % version
     content = re.sub(needle, replacement, content, 1)
     with open(fname, 'w') as f: