diff --git a/MANIFEST.in b/MANIFEST.in
index ebf613aaf42..ec7df7d4dbc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,6 +17,6 @@ recursive-include test *
 include Makefile
 include VERSION
 include MANIFEST.in
-include CHANGELOG.md
+include changelogs/*.rst
 include contrib/README.md
 recursive-include contrib/inventory *
diff --git a/Makefile b/Makefile
index e1939271f7c..873e818b480 100644
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,11 @@ sdist: clean docs
 sdist_upload: clean docs
 	$(PYTHON) setup.py sdist upload 2>&1 |tee upload.log
 
+# TODO: variable-ize major version number usages here
+.PHONY: changelog_reno
+changelog_reno:
+	reno -d changelogs/ report --title 'Ansible 2.5 "Kashmir" Release Notes' --no-collapse-pre-release --no-show-source --earliest-version v2.5.0b1 --output changelogs/CHANGELOG_v2.5.rst
+
 .PHONY: rpmcommon
 rpmcommon: sdist
 	@mkdir -p rpm-build
diff --git a/VERSION b/VERSION
index 6eea6f71c7a..dbfff844342 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1 @@
-2.5.0b1
-
+2.5.0b2
diff --git a/changelogs/CHANGELOG_v2.5.rst b/changelogs/CHANGELOG_v2.5.rst
index b894b70bdc6..e1561c67890 100644
--- a/changelogs/CHANGELOG_v2.5.rst
+++ b/changelogs/CHANGELOG_v2.5.rst
@@ -588,6 +588,8 @@ Bugfixes
 
 - interface_file - accept interfaces without address family or method (https://github.com/ansible/ansible/pull/34200)
 
+- lineinfile - fix insertion if pattern already exists (https://github.com/ansible/ansible/pull/33393)
+
 - nxos_evpn_vni - fixed a number of issues (https://github.com/ansible/ansible/pull/35930)
 
 - nxos_igmp_interface - fix response handling for different nxos versions (https://github.com/ansible/ansible/pull/35959)
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 60b343dbd76..afc5673d6c0 100644
--- a/lib/ansible/release.py
+++ b/lib/ansible/release.py
@@ -19,5 +19,5 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-__version__ = '2.5.0b1'
+__version__ = '2.5.0b2'
 __author__ = 'Ansible, Inc.'
diff --git a/test/runner/lib/classification.py b/test/runner/lib/classification.py
index 49ba9b13491..f9c3c10eefa 100644
--- a/test/runner/lib/classification.py
+++ b/test/runner/lib/classification.py
@@ -570,6 +570,10 @@ class PathMapper(object):
         if path.startswith('ticket_stubs/'):
             return minimal
 
+        # FUTURE: add reno lint sanity test and run that along with yamllint
+        if path.startswith('changelogs/'):
+            return minimal
+
         if '/' not in path:
             if path in (
                     '.gitattributes',