diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index cd1e3562..b9ccf050 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -98,8 +98,8 @@ class Upgrader(object):
             util.pepver_to_semver(to_version))
 
         self._upgraders = [
-            (semantic_version.Version("3.0.0-a1"), self._upgrade_to_3_0_0),
-            (semantic_version.Version("3.0.0-b11"), self._upgrade_to_3_0_0)
+            (semantic_version.Version("3.0.0-a.1"), self._upgrade_to_3_0_0),
+            (semantic_version.Version("3.0.0-b.11"), self._upgrade_to_3_0_0)
         ]
 
     def run(self, ctx):
diff --git a/platformio/util.py b/platformio/util.py
index b3406dbf..46c11965 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -558,7 +558,7 @@ def where_is_program(program, envpath=None):
 
 
 def pepver_to_semver(pepver):
-    return re.sub(r"(\.\d+)\.?(dev|a|b|rc|post)", r"\1-\2", pepver, 1)
+    return re.sub(r"(\.\d+)\.?(dev|a|b|rc|post)", r"\1-\2.", pepver, 1)
 
 
 def rmtree_(path):