diff --git a/update_version_from_git.py b/update_version_from_git.py
index fcb3b5bab..d72dc4ae9 100644
--- a/update_version_from_git.py
+++ b/update_version_from_git.py
@@ -76,7 +76,7 @@ def prerelease_version():
 
     assert len(initpy_ver.split('.')) in [3, 4], 'moto/__init__.py version should be like 0.0.2.dev'
     assert initpy_ver > ver, 'the moto/__init__.py version should be newer than the last tagged release.'
-    return '{initpy_ver}.dev{commits_since}'.format(initpy_ver=initpy_ver, commits_since=commits_since)
+    return '{initpy_ver}.{commits_since}'.format(initpy_ver=initpy_ver, commits_since=commits_since)
 
 def read(*parts):
     """ Reads in file from *parts.
@@ -108,7 +108,7 @@ def release_version_correct():
 
         new_version = prerelease_version()
         print('updating version in __init__.py to {new_version}'.format(new_version=new_version))
-        assert len(new_version.split('.')) == 4, 'moto/__init__.py version should be like 0.0.2.dev'
+        assert len(new_version.split('.')) >= 4, 'moto/__init__.py version should be like 0.0.2.dev'
         migrate_version(initpy, new_version)
     else:
         assert False, "No non-master deployments yet"