diff --git a/twine/wheel.py b/twine/wheel.py
index c1d82352..955214ae 100644
--- a/twine/wheel.py
+++ b/twine/wheel.py
@@ -20,9 +20,13 @@
 from twine import exceptions
 
 wheel_file_re = re.compile(
-    r"""^(?P<namever>(?P<name>.+?)(-(?P<ver>\d.+?))?)
-        ((-(?P<build>\d.*?))?-(?P<pyver>.+?)-(?P<abi>.+?)-(?P<plat>.+?)
-        \.whl|\.dist-info)$""",
+    r"""^(?P<name>[^-]+)-
+         (?P<version>[^-]+)
+         (:?-(?P<build>\d[^-]*))?-
+         (?P<pyver>[^-]+)-
+         (?P<abi>[^-]+)-
+         (?P<plat>[^-]+)
+         \.whl$""",
     re.VERBOSE,
 )