diff --git a/CHANGES b/CHANGES
index 188e22466b..5fffea3198 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,16 @@
 
+2.5-156 | 2017-06-13 11:01:56 -0700
+
+  * Add 2.5.1 news file to master. (Johanna Amann)
+
+  * Remove link to no longer existing myricom plugin. (Johanna Amann)
+
 2.5-152 | 2017-06-05 15:16:49 -0700
 
   * Remove non-existing links; this broke documentation build. (Johanna Amann)
 
   * Fix at_least in Version.bro - it did exactly the oposite of the documented
-	  behavior. (Johanna Amann)
+    behavior. (Johanna Amann)
 
 2.5-147 | 2017-05-22 20:32:32 -0500
 
diff --git a/NEWS b/NEWS
index 7fbc7cfd4f..8333ccf7f8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,8 +4,35 @@ release. For an exhaustive list of changes, see the ``CHANGES`` file
 (note that submodules, such as BroControl and Broccoli, come with
 their own ``CHANGES``.)
 
-Bro 2.6
-=======
+Bro 2.5.1
+=========
+
+New Functionality
+-----------------
+
+- Bro now includes bifs for rename, unlink, and rmdir.
+
+- Bro now includes events for two extensions used by TLS 1.3:
+  ssl_extension_supported_versions and ssl_extension_psk_key_exchange_modes
+
+- Bro now includes hooks that can be used to interact with log processing
+  on the C++ level.
+
+- Bro now supports ERSPAN. Currently this ignores the ethernet header that is
+  carried over the tunnel; if a MAC is logged currently only the outer MAC
+  is returned.
+
+- Added a new BroControl option CrashExpireInterval to enable
+  "broctl cron" to remove crash directories that are older than the
+  specified number of days (the default value is 0, which means crash
+  directories never expire).
+
+- Added a new BroControl option MailReceivingPackets to control
+  whether or not "broctl cron" will mail a warning when it notices
+  that no packets were seen on an interface.
+
+- There is a new broctl command-line option "--version" which outputs
+  the BroControl version.
 
 Changed Functionality
 ---------------------
@@ -13,10 +40,20 @@ Changed Functionality
 - The input framework's Ascii reader is now more resilient. If an input
   is marked to reread a file when it changes and the file didn't exist
   during a check Bro would stop watching the file in previous versions.
-  The same could happen with bad data in a line of a file.  These 
-  situations do not cause Bro to stop watching input files anymore. The 
+  The same could happen with bad data in a line of a file.  These
+  situations do not cause Bro to stop watching input files anymore. The
   old behavior is available through settings in the Ascii reader.
 
+- The RADIUS scripts have been reworked. Requests are now logged even if
+  there is no response. The new framed_addr field in the log indicates
+  if the radius server is hinting at an address for the client. The ttl
+  field indicates how quickly the server is replying to the network access
+  server.
+
+- With the introduction of the Bro package manager, the Bro plugin repository
+  is considered deprecated. The af_packet, postgresql, and tcprs plugins have
+  already been removed and are available via bro-pkg.
+
 Bro 2.5
 =======
 
diff --git a/VERSION b/VERSION
index 3916e2d327..6d510ac694 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-152
+2.5-156