diff --git a/Cargo.lock b/Cargo.lock
index 136f004ade00..fcdff22e8cc2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14931,7 +14931,7 @@ dependencies = [
  "pallet-utility 28.0.0",
  "parity-scale-codec",
  "paste",
- "polkavm 0.17.0",
+ "polkavm 0.18.0",
  "pretty_assertions",
  "rlp 0.6.1",
  "scale-info",
@@ -15019,7 +15019,7 @@ name = "pallet-revive-fixtures"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "polkavm-linker 0.17.1",
+ "polkavm-linker 0.18.0",
  "sp-core 28.0.0",
  "sp-io 30.0.0",
  "toml 0.8.12",
@@ -15133,7 +15133,7 @@ dependencies = [
  "bitflags 1.3.2",
  "parity-scale-codec",
  "paste",
- "polkavm-derive 0.17.0",
+ "polkavm-derive 0.18.0",
  "scale-info",
 ]
 
@@ -20016,19 +20016,6 @@ dependencies = [
  "polkavm-linux-raw 0.10.0",
 ]
 
-[[package]]
-name = "polkavm"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84979be196ba2855f73616413e7b1d18258128aa396b3dc23f520a00a807720e"
-dependencies = [
- "libc",
- "log",
- "polkavm-assembler 0.17.0",
- "polkavm-common 0.17.0",
- "polkavm-linux-raw 0.17.0",
-]
-
 [[package]]
 name = "polkavm"
 version = "0.18.0"
@@ -20060,15 +20047,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "polkavm-assembler"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba7b434ff630b0f73a1560e8baea807246ca22098abe49f97821e0e2d2accc4"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "polkavm-assembler"
 version = "0.18.0"
@@ -20103,16 +20081,6 @@ dependencies = [
  "polkavm-assembler 0.10.0",
 ]
 
-[[package]]
-name = "polkavm-common"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0dbafef4ab6ceecb4982ac3b550df430ef4f9fdbf07c108b7d4f91a0682fce"
-dependencies = [
- "log",
- "polkavm-assembler 0.17.0",
-]
-
 [[package]]
 name = "polkavm-common"
 version = "0.18.0"
@@ -20150,15 +20118,6 @@ dependencies = [
  "polkavm-derive-impl-macro 0.10.0",
 ]
 
-[[package]]
-name = "polkavm-derive"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3dbb6c8c7bd3e5f5b05aa7fc9355acf14df7ce5d392911e77d01090a38d0d"
-dependencies = [
- "polkavm-derive-impl-macro 0.17.0",
-]
-
 [[package]]
 name = "polkavm-derive"
 version = "0.18.0"
@@ -20204,18 +20163,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "polkavm-derive-impl"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42565aed4adbc4034612d0b17dea8db3681fb1bd1aed040d6edc5455a9f478a1"
-dependencies = [
- "polkavm-common 0.17.0",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "polkavm-derive-impl"
 version = "0.18.0"
@@ -20258,16 +20205,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "polkavm-derive-impl-macro"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d9838e95241b0bce4fe269cdd4af96464160505840ed5a8ac8536119ba19e2"
-dependencies = [
- "polkavm-derive-impl 0.17.0",
- "syn 2.0.87",
-]
-
 [[package]]
 name = "polkavm-derive-impl-macro"
 version = "0.18.0"
@@ -20308,22 +20245,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "polkavm-linker"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0422ead3030d5cde69e2206dbc7d65da872b121876507cd5363f6c6e6aa45157"
-dependencies = [
- "dirs",
- "gimli 0.31.1",
- "hashbrown 0.14.5",
- "log",
- "object 0.36.1",
- "polkavm-common 0.17.0",
- "regalloc2 0.9.3",
- "rustc-demangle",
-]
-
 [[package]]
 name = "polkavm-linker"
 version = "0.18.0"
@@ -20352,12 +20273,6 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26e45fa59c7e1bb12ef5289080601e9ec9b31435f6e32800a5c90c132453d126"
 
-[[package]]
-name = "polkavm-linux-raw"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64c3d93a58ffbc3099d1227f0da9675a025a9ea6c917038f266920c1de1e568"
-
 [[package]]
 name = "polkavm-linux-raw"
 version = "0.18.0"
diff --git a/prdoc/pr_6937.prdoc b/prdoc/pr_6937.prdoc
new file mode 100644
index 000000000000..5c6806df0b5c
--- /dev/null
+++ b/prdoc/pr_6937.prdoc
@@ -0,0 +1,12 @@
+title: '[pallet-revive] bump polkavm to 0.18'
+doc:
+- audience: Runtime Dev
+  description: Update to the latest polkavm version, containing a linker fix I need
+    for revive.
+crates:
+- name: pallet-revive
+  bump: patch
+- name: pallet-revive-fixtures
+  bump: patch
+- name: pallet-revive-uapi
+  bump: patch
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index 6e244ad4d652..5d2bfb4f795e 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 environmental = { workspace = true }
 paste = { workspace = true }
-polkavm = { version = "0.17.0", default-features = false }
+polkavm = { version = "0.18.0", default-features = false }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index 459ec1369434..1095f962ac1b 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -21,7 +21,7 @@ anyhow = { workspace = true, default-features = true, optional = true }
 
 [build-dependencies]
 toml = { workspace = true }
-polkavm-linker = { version = "0.17.0" }
+polkavm-linker = { version = "0.18.0" }
 anyhow = { workspace = true, default-features = true }
 
 [features]
diff --git a/substrate/frame/revive/fixtures/build/_Cargo.toml b/substrate/frame/revive/fixtures/build/_Cargo.toml
index 8dc38e14c14b..5d1c922f9002 100644
--- a/substrate/frame/revive/fixtures/build/_Cargo.toml
+++ b/substrate/frame/revive/fixtures/build/_Cargo.toml
@@ -14,7 +14,7 @@ edition = "2021"
 [dependencies]
 uapi = { package = 'pallet-revive-uapi', path = "", features = ["unstable-api"], default-features = false }
 common = { package = 'pallet-revive-fixtures-common', path = "" }
-polkavm-derive = { version = "0.17.0" }
+polkavm-derive = { version = "0.18.0" }
 
 [profile.release]
 opt-level = 3
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm
index 5c3995bffe35..77de4ff3b1b3 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/ErrorTester.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm
index 7880647f3792..6dbc5ca8b108 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/EventExample.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm
index 1f036fa37948..488ee684f0c4 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/Flipper.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm
index 92304419dda7..585fbb392a31 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/FlipperCaller.polkavm differ
diff --git a/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm b/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm
index b29c640a2fee..3f96fdfc21d8 100644
Binary files a/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm and b/substrate/frame/revive/rpc/examples/js/pvm/PiggyBank.polkavm differ
diff --git a/substrate/frame/revive/uapi/Cargo.toml b/substrate/frame/revive/uapi/Cargo.toml
index 1af5b327dfc7..8274bf36204b 100644
--- a/substrate/frame/revive/uapi/Cargo.toml
+++ b/substrate/frame/revive/uapi/Cargo.toml
@@ -21,7 +21,7 @@ codec = { features = [
 ], optional = true, workspace = true }
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]
-polkavm-derive = { version = "0.17.0" }
+polkavm-derive = { version = "0.18.0" }
 
 [package.metadata.docs.rs]
 default-target = ["riscv64imac-unknown-none-elf"]