diff --git a/NEWS b/NEWS
index 052da5e..1283f3e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
 News (mainly features/major bug fixes)
 
+portage-2.3.7
+-----------------
+* eapply_user combines patch basenames from all matched directories into a
+  list, and applies them in POSIX sorted order. This allows patches in
+  more-specific directories to override patches of the same basename found
+  in less-specific directories. An empty patch (or /dev/null symlink) negates
+  a patch with the same basename found in a less-specific directory.
+* FEATURES=multilib-strict no longer recurses into subdirectories, in order
+  to avoid false-positives. The MULTILIB_STRICT_EXEMPT variable only served
+  to filter false-positives that were triggered by recursion, so it will no
+  longer be needed.
+* New emerge --autounmask-keep-keywords and --onlydeps-with-rdeps=<y|n>
+  options.
+
+
 portage-2.3.5
 -----------------
 * Numerous patches updating checksums code and python module imports for them
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 56e9c89..a8f9ae6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,20 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.3.7
+==================================
+* Bug Fixes:
+    - Bug 424423 multilib-strict: disable recursion into subdirectories
+    - Bug 608880 eapply_user: combine sort for all dirs
+    - Bug 610670 man/portage.5: document -* in profile "packages" files
+    - Bug 619612 emerge: warn for --autounmask-continue with --autounmask=n
+    - Bug 619620 depgraph: account for binpkg-multi-instance in unused warning
+    - Bug 619626 depgraph: prune unnecessary rebuilds for --autounmask-continue
+    - Bug 622480 emerge: add --autounmask-keep-keywords option
+    - Bug 623648 fuzzy search: weigh category similarity independently
+    - Bug 625246 emerge --getbinpkg: https support for If-Modified-Since
+
+
 portage-2.3.6
 ==================================
 * Bug Fixes:
diff --git a/setup.py b/setup.py
index e9b01d9..a73dc2e 100755
--- a/setup.py
+++ b/setup.py
@@ -659,7 +659,7 @@
 
 setup(
 	name = 'portage',
-	version = '2.3.6',
+	version = '2.3.7',
 	url = 'https://wiki.gentoo.org/wiki/Project:Portage',
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',