diff --git a/setup.py b/setup.py
index d9dd5f8e3..2b1b23cd7 100644
--- a/setup.py
+++ b/setup.py
@@ -471,7 +471,7 @@ def produce_execution_payload(parent_hash: Hash32, timestamp: uint64) -> Executi
 
 spec_builders = {
     builder.fork: builder
-    for builder in (AltairSpecBuilder, )
+    for builder in (Phase0SpecBuilder, AltairSpecBuilder, MergeSpecBuilder)
 }
 
 
diff --git a/specs/altair/p2p-interface.md b/specs/altair/p2p-interface.md
index f76c3bce9..a32137d1f 100644
--- a/specs/altair/p2p-interface.md
+++ b/specs/altair/p2p-interface.md
@@ -182,6 +182,8 @@ Request and Response remain unchanged. A `ForkDigest`-context is used to select
 
 Per `context = compute_fork_digest(fork_version, genesis_validators_root)`:
 
+[0]: # (eth2spec: skip)
+
 | `fork_version`           | Chunk SSZ type             |
 | ------------------------ | -------------------------- |
 | `GENESIS_FORK_VERSION`   | `phase0.SignedBeaconBlock` |
@@ -195,6 +197,8 @@ Request and Response remain unchanged. A `ForkDigest`-context is used to select
 
 Per `context = compute_fork_digest(fork_version, genesis_validators_root)`:
 
+[1]: # (eth2spec: skip)
+
 | `fork_version`           | Chunk SSZ type             |
 | ------------------------ | -------------------------- |
 | `GENESIS_FORK_VERSION`   | `phase0.SignedBeaconBlock` |