3 files changed, 19 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1d1136f16..dd04a448e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 News (mainly features/major bug fixes)
 
+portage-2.2.25
+--------------
+* EAPI 6 final fully implemented.
+
+
 portage-2.2.22
 -------------
 * Stage 1 of the repoman re-write code merged in to master branch
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fe89e8531..69d96e87a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,19 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.2.25
+==================================
+* Bug Fixes:
+    - Bug 564988 Rsync and Git Sync: skip metadata-transfer when appropriate
+    - Bug 565172 repos.conf: support sync-hooks-only-on-change attribute
+    - Bug 565540 egencache: parallelize --update-changelogs
+    - Bug 565626 egencache: Delay updating Manifests until all other
+                 tasks complete
+* EAPI 6 final updates and changes.
+* locale: Warn when locale does not conform to ASCII rules for case conversions.
+          Force sane LC_COLLATE & LC_CTYPE as required in EAPI 6.
+
+
 portage-2.2.24
 ==================================
 * Bug Fixes:
diff --git a/setup.py b/setup.py
index a754c89cf..0f08f5486 100755
--- a/setup.py
+++ b/setup.py
@@ -615,7 +615,7 @@ def get_manpages():
 
 setup(
 	name = 'portage',
-	version = '2.2.24',
+	version = '2.2.25',
 	url = 'https://wiki.gentoo.org/wiki/Project:Portage',
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',