diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3422ca8b92..5dedf0bf43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckCSourceCompiles)
 
 set (MapServer_VERSION_MAJOR 7)
 set (MapServer_VERSION_MINOR 0)
-set (MapServer_VERSION_REVISION 7)
+set (MapServer_VERSION_REVISION 8)
 set (MapServer_VERSION_SUFFIX "")
 
 set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
diff --git a/HISTORY.TXT b/HISTORY.TXT
index 8f4d722420..26a49f6898 100644
--- a/HISTORY.TXT
+++ b/HISTORY.TXT
@@ -12,6 +12,12 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/
 
+7.0.8 release (2021-4-30)
+-------------------------
+
+- Security release, see ticket #6313 for more information.
+- Improve setting of key environment vars for FastCGI/IIS, see ticket #6289.
+
 7.0.0 release (2015/07/24)
 --------------------------