diff --git a/CHANGES b/CHANGES
index 532c18bcc6..2958d4bb60 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
 
+2.5-582 | 2018-05-21 13:34:16 -0500
+
+  * Update link to flex pattern docs (Corelight)
+
+  * Add non-standard experimental Google post-quantum ciphers (Johanna Amann)
+
+  * ARP: fix the l2 source address check for ARP over Wi-Fi (Pierre LALET)
+
+  * Support 802.11 monitor mode (Pierre LALET)
+
 2.5-569 | 2018-05-10 11:24:07 -0500
 
   * BIT-1927: relocate notice/extend-email/ scripts to policy/ dir and
diff --git a/VERSION b/VERSION
index beed657a9e..ccba4e2ffe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-569
+2.5-582
diff --git a/doc/script-reference/types.rst b/doc/script-reference/types.rst
index 651ebfb411..34388e9958 100644
--- a/doc/script-reference/types.rst
+++ b/doc/script-reference/types.rst
@@ -198,7 +198,7 @@ Here is a more detailed description of each type:
     for fast text-searching operations.  Pattern constants are created
     by enclosing text within forward slashes (/) and is the same syntax
     as the patterns supported by the `flex lexical analyzer
-    <http://flex.sourceforge.net/manual/Patterns.html>`_.  The speed of
+    <http://westes.github.io/flex/manual/Patterns.html>`_.  The speed of
     regular expression matching does not depend on the complexity or
     size of the patterns.  Patterns support two types of matching, exact
     and embedded.