diff --git a/amrclaw b/amrclaw
index 7d3e82fc7..9653a802e 160000
--- a/amrclaw
+++ b/amrclaw
@@ -1 +1 @@
-Subproject commit 7d3e82fc7c4f138dcaa762b1ee5d1c09b79e43be
+Subproject commit 9653a802ea2e0f4a547999a1eacafc12c8ce75f2
diff --git a/clawpack/__init__.py b/clawpack/__init__.py
index 77faf3fc2..6ba6b75df 100644
--- a/clawpack/__init__.py
+++ b/clawpack/__init__.py
@@ -21,4 +21,4 @@
                 if _os.path.isdir(_sdir))
 del _root, _path
 
-__version__ = '5.7.1'   # must also be changed in setup.py
+__version__ = '5.8.0'   # must also be changed in setup.py
diff --git a/geoclaw b/geoclaw
index ec5966d4a..01c9a8e07 160000
--- a/geoclaw
+++ b/geoclaw
@@ -1 +1 @@
-Subproject commit ec5966d4aeb1564d760ea3a8321ecbdd7ec8bc97
+Subproject commit 01c9a8e07cbb65b6bb21d8e5f79a09abecb1c4ae
diff --git a/pyclaw b/pyclaw
index a85a01a5f..97789e54b 160000
--- a/pyclaw
+++ b/pyclaw
@@ -1 +1 @@
-Subproject commit a85a01a5f20be1a18dde70b7bb37dc1cdcbd0b26
+Subproject commit 97789e54ba07cd09b2e4e29eaa5275b32a2af97b
diff --git a/setup.py b/setup.py
index 207f54cd0..ef2dfcaab 100644
--- a/setup.py
+++ b/setup.py
@@ -55,8 +55,8 @@
 
 # version must also be changed in clawpack/__init__.py
 MAJOR               = 5
-MINOR               = 7
-MICRO               = 1
+MINOR               = 8
+MICRO               = 0
 TYPE                = ''
 VERSION             = '%d.%d.%d%s' % (MAJOR, MINOR, MICRO, TYPE)