diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f04a2371..4fd3d5b2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,9 +3,17 @@
 ====================
 
 -------------------------------------------------------------------------------
- Current Development
+ Version 5.8.0   18 Mar 2020
 -------------------------------------------------------------------------------
 
+- Remove use of namespace packages (#85)
+- Rework optional dependency imports (#84, #87)
+- Fix column width in pyutilib.misc config tests (#69)
+- Add a compatibility shim for assertRaisesRegex and assertRegex (#79, #83)
+- Force PyYAML<=5.2 for Python 3.4 tests (#78)
+- Clean up setup.py and setup.cfg (#75)
+- Fix for running tests on Windows with Python 3.8 (#77)
+- Improve output from ConfigBlock display() (#76)
 
 -------------------------------------------------------------------------------
  Version 5.7.3   13 Dec 2019
diff --git a/RELEASE.txt b/RELEASE.txt
index ef40c17d..b06bd0eb 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1,13 +1,14 @@
-We are pleased to announce the release of PyUtilib 5.7.3. The
+We are pleased to announce the release of PyUtilib 5.8.0. The
 PyUtilib project supports the development of an ensemble of Python
 packages that include a wide variety of utilities, including a
 well-developed component architecture.
 
-The following are highlights of the 5.7 release series:
+The following are highlights of the 5.8 release series:
 
-- Dropped support for Python 2.6
-- Updates to resolve testing issues
-- Minor bug fixes including support for Python 3.8
+- Removed use of pyutilib and pyutilib.component namespace packages
+- Reworked optional dependency imports to speed up importing
+
+Additional changes are listed in CHANGELOG.txt
 
 PyUtilib can be installed from PyPI using pip or conda-forge using conda.
 
diff --git a/setup.py b/setup.py
index 9cec6ee1..5efd8e27 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ def read(*rnames):
     requires.append('ordereddict')
 
 setup(name="PyUtilib",
-    version='5.7.4.dev0',
+    version='5.8.0',
     maintainer='William E. Hart',
     maintainer_email='wehart@sandia.gov',
     url = 'https://github.com/PyUtilib/pyutilib',