diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd13405e..16909c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.18.0 (2023-04-03)
+===
+
+* Update to mmtk-core 0.18.0.
+
 0.17.0 (2023-02-17)
 ===
 
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index 3b79057e..c5507d45 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -395,8 +395,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk"
-version = "0.17.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=0fb520a61795c5a079ce09f59f1da7af7c3422d5#0fb520a61795c5a079ce09f59f1da7af7c3422d5"
+version = "0.18.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=f8469b0a019bea58cba26e9fb5c70fb7398ccd31#f8469b0a019bea58cba26e9fb5c70fb7398ccd31"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -416,6 +416,7 @@ dependencies = [
  "num_cpus",
  "regex",
  "spin",
+ "static_assertions",
  "strum",
  "strum_macros",
  "sys-info",
@@ -423,8 +424,8 @@ dependencies = [
 
 [[package]]
 name = "mmtk-macros"
-version = "0.17.0"
-source = "git+https://github.com/mmtk/mmtk-core.git?rev=0fb520a61795c5a079ce09f59f1da7af7c3422d5#0fb520a61795c5a079ce09f59f1da7af7c3422d5"
+version = "0.18.0"
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=f8469b0a019bea58cba26e9fb5c70fb7398ccd31#f8469b0a019bea58cba26e9fb5c70fb7398ccd31"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -434,7 +435,7 @@ dependencies = [
 
 [[package]]
 name = "mmtk_jikesrvm"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "lazy_static",
  "libc",
@@ -633,6 +634,12 @@ dependencies = [
  "lock_api",
 ]
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "strum"
 version = "0.24.1"
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 59893df3..50498421 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mmtk_jikesrvm"
-version = "0.17.0"
+version = "0.18.0"
 authors = [" <>"]
 rust-version = "1.61.0"
 
@@ -28,7 +28,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
 # - change branch/rev
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "0fb520a61795c5a079ce09f59f1da7af7c3422d5" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "f8469b0a019bea58cba26e9fb5c70fb7398ccd31" }
 # Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
 # mmtk = { path = "../repos/mmtk-core" }