diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 16a24f284d..1dbd540491 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -6866,9 +6866,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.32"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
diff --git a/substrate/client/chain-spec/derive/Cargo.toml b/substrate/client/chain-spec/derive/Cargo.toml
index 97573c8ca3..1ea9440572 100644
--- a/substrate/client/chain-spec/derive/Cargo.toml
+++ b/substrate/client/chain-spec/derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.1.0"
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 quote = "1.0.10"
 syn = "1.0.82"
 
diff --git a/substrate/client/tracing/proc-macro/Cargo.toml b/substrate/client/tracing/proc-macro/Cargo.toml
index 53d463a4f4..e939d0837b 100644
--- a/substrate/client/tracing/proc-macro/Cargo.toml
+++ b/substrate/client/tracing/proc-macro/Cargo.toml
@@ -16,6 +16,6 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.1.0"
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 quote = { version = "1.0.10", features = ["proc-macro"] }
 syn = { version = "1.0.82", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/substrate/frame/staking/reward-curve/Cargo.toml b/substrate/frame/staking/reward-curve/Cargo.toml
index 7d95152ea6..bcbdffd6ad 100644
--- a/substrate/frame/staking/reward-curve/Cargo.toml
+++ b/substrate/frame/staking/reward-curve/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.82", features = ["full", "visit"] }
 quote = "1.0.10"
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 proc-macro-crate = "1.1.0"
 
 [dev-dependencies]
diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
index 7a1eaa3a08..640fe436b1 100644
--- a/substrate/frame/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 frame-support-procedural-tools = { version = "4.0.0-dev", path = "./tools" }
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 quote = "1.0.10"
 Inflector = "0.11.4"
 syn = { version = "1.0.82", features = ["full"] }
diff --git a/substrate/frame/support/procedural/tools/Cargo.toml b/substrate/frame/support/procedural/tools/Cargo.toml
index 265952ebc4..ae2de2effd 100644
--- a/substrate/frame/support/procedural/tools/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 quote = "1.0.10"
 syn = { version = "1.0.82", features = ["full", "visit", "extra-traits"] }
 proc-macro-crate = "1.1.0"
diff --git a/substrate/frame/support/procedural/tools/derive/Cargo.toml b/substrate/frame/support/procedural/tools/derive/Cargo.toml
index df994e1422..5ed1b506df 100644
--- a/substrate/frame/support/procedural/tools/derive/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/derive/Cargo.toml
@@ -15,6 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 quote = { version = "1.0.10", features = ["proc-macro"] }
 syn = { version = "1.0.82", features = ["proc-macro" ,"full", "extra-traits", "parsing"] }
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr
index 4af672a261..c6baf8fc24 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr
@@ -1,5 +1,5 @@
 error: expected `where`
- --> $DIR/missing_where_block.rs:4:19
+ --> tests/construct_runtime_ui/missing_where_block.rs:4:19
   |
 4 |     pub enum Runtime {}
-  |                      ^^
+  |                      ^
diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
index ac7313523c..fb7e38b53d 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
@@ -1,5 +1,5 @@
 error: Missing associated type for `UncheckedExtrinsic`. Add `UncheckedExtrinsic` = ... to where section.
- --> $DIR/missing_where_param.rs:7:2
+ --> tests/construct_runtime_ui/missing_where_param.rs:7:2
   |
 7 |     {}
-  |     ^^
+  |     ^
diff --git a/substrate/primitives/api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml
index 4afc078336..30ab3ef956 100644
--- a/substrate/primitives/api/proc-macro/Cargo.toml
+++ b/substrate/primitives/api/proc-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 [dependencies]
 quote = "1.0.10"
 syn = { version = "1.0.82", features = ["full", "fold", "extra-traits", "visit"] }
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 blake2-rfc = { version = "0.2.18", default-features = false }
 proc-macro-crate = "1.1.0"
 
diff --git a/substrate/primitives/core/hashing/proc-macro/Cargo.toml b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
index 4df40e55bc..fea865ab9e 100644
--- a/substrate/primitives/core/hashing/proc-macro/Cargo.toml
+++ b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
@@ -18,5 +18,5 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.82", features = ["full", "parsing"] }
 quote = "1.0.6"
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 sp-core-hashing = { version = "4.0.0", path = "../", default-features = false }
diff --git a/substrate/primitives/npos-elections/solution-type/Cargo.toml b/substrate/primitives/npos-elections/solution-type/Cargo.toml
index cf2a201650..cfb3af4552 100644
--- a/substrate/primitives/npos-elections/solution-type/Cargo.toml
+++ b/substrate/primitives/npos-elections/solution-type/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.82", features = ["full", "visit"] }
 quote = "1.0"
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 proc-macro-crate = "1.1.0"
 
 [dev-dependencies]
diff --git a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
index 031906486b..f69c49843c 100644
--- a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -18,6 +18,6 @@ proc-macro = true
 [dependencies]
 syn = { version = "1.0.82", features = ["full", "visit", "fold", "extra-traits"] }
 quote = "1.0.10"
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 Inflector = "0.11.4"
 proc-macro-crate = "1.1.0"
diff --git a/substrate/primitives/version/proc-macro/Cargo.toml b/substrate/primitives/version/proc-macro/Cargo.toml
index df254e64f3..a706f74f45 100644
--- a/substrate/primitives/version/proc-macro/Cargo.toml
+++ b/substrate/primitives/version/proc-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 [dependencies]
 quote = "1.0.10"
 syn = { version = "1.0.82", features = ["full", "fold", "extra-traits", "visit"] }
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
 
 [dev-dependencies]
diff --git a/substrate/test-utils/derive/Cargo.toml b/substrate/test-utils/derive/Cargo.toml
index 83782a2ba5..166d9cc1ef 100644
--- a/substrate/test-utils/derive/Cargo.toml
+++ b/substrate/test-utils/derive/Cargo.toml
@@ -12,7 +12,7 @@ description = "Substrate test utilities macros"
 quote = "1.0.10"
 syn = { version = "1.0.82", features = ["full"] }
 proc-macro-crate = "1.1.0"
-proc-macro2 = "1.0.29"
+proc-macro2 = "1.0.36"
 
 [lib]
 proc-macro = true