diff --git a/evmc b/evmc
index 17fd712701..18bea410e2 160000
--- a/evmc
+++ b/evmc
@@ -1 +1 @@
-Subproject commit 17fd712701502ffe0588df34f006a7ef3d2f954e
+Subproject commit 18bea410e24929ebd185c789e6255242ea0f426c
diff --git a/lib/evmone/baseline_instruction_table.cpp b/lib/evmone/baseline_instruction_table.cpp
index 8ec210db22..5dd875318b 100644
--- a/lib/evmone/baseline_instruction_table.cpp
+++ b/lib/evmone/baseline_instruction_table.cpp
@@ -40,6 +40,7 @@ constexpr InstructionTable instruction_tables[] = {
     create_instruction_table<EVMC_ISTANBUL>(),
     create_instruction_table<EVMC_BERLIN>(),
     create_instruction_table<EVMC_LONDON>(),
+    create_instruction_table<EVMC_SHANGHAI>(),
 };
 static_assert(std::size(instruction_tables) == EVMC_MAX_REVISION + 1,
     "instruction table entry missing for an EVMC revision");
diff --git a/lib/evmone/instruction_traits.hpp b/lib/evmone/instruction_traits.hpp
index 53044c7025..65b90b4630 100644
--- a/lib/evmone/instruction_traits.hpp
+++ b/lib/evmone/instruction_traits.hpp
@@ -370,4 +370,7 @@ constexpr inline std::array<int16_t, 256> gas_costs<EVMC_LONDON> = []() noexcept
     return table;
 }();
 
+template <>
+constexpr inline auto gas_costs<EVMC_SHANGHAI> = gas_costs<EVMC_LONDON>;
+
 }  // namespace evmone::instr
diff --git a/lib/evmone/instructions.cpp b/lib/evmone/instructions.cpp
index f158031c04..f0fae64fb4 100644
--- a/lib/evmone/instructions.cpp
+++ b/lib/evmone/instructions.cpp
@@ -352,6 +352,7 @@ constexpr op_table op_tables[] = {
     create_op_table<EVMC_ISTANBUL>(),
     create_op_table<EVMC_BERLIN>(),
     create_op_table<EVMC_LONDON>(),
+    create_op_table<EVMC_SHANGHAI>(),
 };
 static_assert(
     std::size(op_tables) == EVMC_MAX_REVISION + 1, "op table entry missing for an EVMC revision");