diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f1cfc67..cc09ee1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,15 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.3.18
+==================================
+* Bug Fixes:
+    - Bug 640290 PORTAGE_XATTR_EXCLUDE: add common user.* attributes
+    - Bug 640318 handle binary package IUSE_IMPLICIT divergence
+    - Bug 640376 doins: remove file before creating symlink
+    - Bug 640450 fix binary package extraction for USERLAND_BSD
+
+
 portage-2.3.17
 ==================================
 * Bug Fixes:
diff --git a/setup.py b/setup.py
index a584cd8..a9e6398 100755
--- a/setup.py
+++ b/setup.py
@@ -663,7 +663,7 @@
 
 setup(
 	name = 'portage',
-	version = '2.3.17',
+	version = '2.3.18',
 	url = 'https://wiki.gentoo.org/wiki/Project:Portage',
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',