diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 40b50e1688..96d613ea0b 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -40,7 +40,7 @@ from bb import cooker
 from bb import ui
 from bb import server
 
-__version__ = "1.17.1"
+__version__ = "1.18.0"
 logger = logging.getLogger("BitBake")
 
 # Unbuffer stdout to avoid log truncation in the event
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index fd04d47e4a..d6cf64f74e 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = "1.17.1"
+__version__ = "1.18.0"
 
 import sys
 if sys.version_info < (2, 6, 0):