diff --git a/build.py b/build.py
index dd61da15..05940d23 100755
--- a/build.py
+++ b/build.py
@@ -1491,9 +1491,9 @@ def cmd_bdist_egg(options, args):
     _doSimpleSetupCmd(options, args, 'bdist_egg')
     cfg = Config()
     if options.upload:
-        filemask = "dist/%s-%s-*.egg" % (baseName, cfg.VERSION.replace('-', '_'))
+        filemask = "dist/%s-%s-*.egg" % (baseName, cfg.VERSION)
         filenames = glob.glob(filemask)
-        assert len(filenames) == 1
+        assert len(filenames) == 1, "Unknown files found:"+repr(filenames)
         uploadPackage(filenames[0], options)
 
 
@@ -1501,9 +1501,9 @@ def cmd_bdist_wheel(options, args):
     _doSimpleSetupCmd(options, args, 'bdist_wheel')
     cfg = Config()
     if options.upload:
-        filemask = "dist/%s-%s-*.whl" % (baseName, cfg.VERSION.replace('-', '_'))
+        filemask = "dist/%s-%s-*.whl" % (baseName, cfg.VERSION)
         filenames = glob.glob(filemask)
-        assert len(filenames) == 1
+        assert len(filenames) == 1, "Unknown files found:"+repr(filenames)
         uploadPackage(filenames[0], options)
 
 
@@ -1511,9 +1511,9 @@ def cmd_bdist_wininst(options, args):
     _doSimpleSetupCmd(options, args, 'bdist_wininst')
     cfg = Config()
     if options.upload:
-        filemask = "dist/%s-%s-*.exe" % (baseName, cfg.VERSION.replace('-', '_'))
+        filemask = "dist/%s-%s-*.exe" % (baseName, cfg.VERSION)
         filenames = glob.glob(filemask)
-        assert len(filenames) == 1
+        assert len(filenames) == 1, "Unknown files found:"+repr(filenames)
         uploadPackage(filenames[0], options)
 
 
diff --git a/setup.py b/setup.py
index d33a1905..8fe946ff 100644
--- a/setup.py
+++ b/setup.py
@@ -59,11 +59,6 @@ or the `wxPython API documentation <https://wxpython.org/Phoenix/docs/html/main.
 
 # or maybe LONG_DESCRIPTION=open("README.rst").read() ??
 
-if version.VER_FLAGS:
-    LONG_DESCRIPTION += """
-:note: To install pre-release versions don't forget to add the ``--pre`` flag 
-    to the ``pip install`` command.
-"""
 
 CLASSIFIERS      = """\
 Development Status :: 3 - Alpha