diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 9e38e4cfe..92ab17d99 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.17.3
+current_version = 1.18.0
 
 [bumpversion:file:src/zxbc/version.py]
 search = VERSION: Final[str] = "{current_version}"
@@ -13,6 +13,6 @@ replace = VERSION = "{new_version}"
 search = version = "{current_version}"
 replace = version = "{new_version}"
 
-[bumpversion:file:docs/doc/archive.md]
+[bumpversion:file:docs/archive.md]
 search = {current_version}
 replace = {new_version}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64a68b79b..d2f65abae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-[v1.18.0](https://github.com/boriel/zxbasic/tree/v1.18.0)
+[v1.18.0](https://github.com/boriel-basic/zxbasic/tree/v1.18.0)
 ===
 + ! Fixes bug with local arrays and arrays pased byRef
 + All booleans are now normalized smartly!
diff --git a/docs/archive.md b/docs/archive.md
index 6a253d407..450e9d313 100644
--- a/docs/archive.md
+++ b/docs/archive.md
@@ -10,28 +10,28 @@ repository (git).
 You can contribute to ZX BASIC by reporting possible bugs or improvement suggestions at the
 [forum](http://www.boriel.com/forum) or in social media.
 
-Latest stable version is <span style="color: green;">**1.17.3**</span>.
+Latest stable version is <span style="color: green;">**1.18.0**</span>.
 Click on the desired icon below to download the package suitable for your platform:
 
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/win32.png" alt="win32zip" width="32px"/>
-  https://www.boriel.com/files/zxb/zxbasic-1.17.3-win32.zip](https://www.boriel.com/files/zxb/zxbasic-1.17.3-win32.zip)
+  https://www.boriel.com/files/zxb/zxbasic-1.18.0-win32.zip](https://www.boriel.com/files/zxb/zxbasic-1.18.0-win32.zip)
 <br />Windows .exe zip package. No install needed, just uncompress it in a directory of your choice.
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/macos.png" alt="macostargz" width="32px"/>
-  https://www.boriel.com/files/zxb/zxbasic-1.17.3-macos.tar.gz](https://www.boriel.com/files/zxb/zxbasic-1.17.3-macos.tar.gz)
+  https://www.boriel.com/files/zxb/zxbasic-1.18.0-macos.tar.gz](https://www.boriel.com/files/zxb/zxbasic-1.18.0-macos.tar.gz)
 <br />Mac OS x64 package. No install needed, just uncompress it in a directory of your choice (needs Python installed
 in your system).
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/linux.png" alt="macostargz" width="32px"/>
-  https://www.boriel.com/files/zxb/zxbasic-1.17.3-linux64.tar.gz](https://www.boriel.com/files/zxb/zxbasic-1.17.3-linux64.tar.gz)
+  https://www.boriel.com/files/zxb/zxbasic-1.18.0-linux64.tar.gz](https://www.boriel.com/files/zxb/zxbasic-1.18.0-linux64.tar.gz)
 <br />Linux x64 binary package. No install needed, just uncompress it in a directory of your choice.
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/zip-package.png" alt="zip" width="32px"/>
-  https://www.boriel.com/files/zxb/zxbasic-1.17.3.zip](https://www.boriel.com/files/zxb/zxbasic-1.17.3.zip)
+  https://www.boriel.com/files/zxb/zxbasic-1.18.0.zip](https://www.boriel.com/files/zxb/zxbasic-1.18.0.zip)
 <br />Windows, Linux, Mac zip package, with python scripts. Requires python installed in your system.
 <br/>&nbsp;
 * [<img src="https://zxbasic.readthedocs.io/en/docs/img/driver-down.png" alt="tar.gz" width="32px"/>
-  https://www.boriel.com/files/zxb/zxbasic-1.17.3.tar.gz](https://www.boriel.com/files/zxb/zxbasic-1.17.3.tar.gz)
+  https://www.boriel.com/files/zxb/zxbasic-1.18.0.tar.gz](https://www.boriel.com/files/zxb/zxbasic-1.18.0.tar.gz)
 <br />Windows, Linux, Mac tar.gz package, with python scripts. Requires python installed in your system.
 
 ### What's new
diff --git a/pyproject.toml b/pyproject.toml
index e91b32674..fef8a250e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zxbasic"
-version = "1.17.3"
+version = "1.18.0"
 description = "Boriel's ZX BASIC Compiler"
 authors = ["Jose Rodriguez <boriel@gmail.com>"]
 license = "AGPL-3.0-or-later"
diff --git a/src/zxbasm/version.py b/src/zxbasm/version.py
index 2c68bd684..4c0681d4c 100644
--- a/src/zxbasm/version.py
+++ b/src/zxbasm/version.py
@@ -1 +1 @@
-VERSION = "1.17.3"
+VERSION = "1.18.0"
diff --git a/src/zxbc/version.py b/src/zxbc/version.py
index 29938224d..90aa58ab8 100755
--- a/src/zxbc/version.py
+++ b/src/zxbc/version.py
@@ -1,3 +1,3 @@
 from typing import Final
 
-VERSION: Final[str] = "1.17.3"
+VERSION: Final[str] = "1.18.0"