diff --git a/wire/extracted_peer_exp_channel_types.patch b/wire/extracted_peer_exp_channel_types.patch
new file mode 100644
index 000000000000..d14f2f13a7d7
--- /dev/null
+++ b/wire/extracted_peer_exp_channel_types.patch
@@ -0,0 +1,25 @@
+diff --git a/wire/peer_wire.csv b/wire/peer_wire.csv
+index 40b78f175..e14d39fdc 100644
+--- a/wire/peer_wire.csv
++++ b/wire/peer_wire.csv
+@@ -91,6 +91,11 @@ msgdata,open_channel,channel_flags,byte,
+ msgdata,open_channel,tlvs,open_channel_tlvs,
+ tlvtype,open_channel_tlvs,upfront_shutdown_script,0
+ tlvdata,open_channel_tlvs,upfront_shutdown_script,shutdown_scriptpubkey,byte,...
++tlvtype,open_channel_tlvs,channel_types,1
++tlvdata,open_channel_tlvs,channel_types,types,channel_type,...
++subtype,channel_type
++subtypedata,channel_type,len,u16,
++subtypedata,channel_type,features,byte,len
+ msgtype,accept_channel,33
+ msgdata,accept_channel,temporary_channel_id,byte,32
+ msgdata,accept_channel,dust_limit_satoshis,u64,
+@@ -109,6 +114,8 @@ msgdata,accept_channel,first_per_commitment_point,point,
+ msgdata,accept_channel,tlvs,accept_channel_tlvs,
+ tlvtype,accept_channel_tlvs,upfront_shutdown_script,0
+ tlvdata,accept_channel_tlvs,upfront_shutdown_script,shutdown_scriptpubkey,byte,...
++tlvtype,accept_channel_tlvs,channel_type,1
++tlvdata,accept_channel_tlvs,channel_type,type,channel_type,
+ msgtype,funding_created,34
+ msgdata,funding_created,temporary_channel_id,byte,32
+ msgdata,funding_created,funding_txid,sha256,
diff --git a/wire/extracted_peer_exp_upgradable.patch b/wire/extracted_peer_exp_upgradable.patch
index db26af74680e..2f85d96acde3 100644
--- a/wire/extracted_peer_exp_upgradable.patch
+++ b/wire/extracted_peer_exp_upgradable.patch
@@ -1,6 +1,6 @@
 --- wire/peer_wire.csv	2021-05-09 15:44:59.166135652 +0930
 +++ wire/peer_wire.csv.raw	2021-05-11 09:59:31.695459756 +0930
-@@ -221,6 +131,18 @@
+@@ -221,6 +131,15 @@
  msgdata,channel_reestablish,next_revocation_number,u64,
  msgdata,channel_reestablish,your_last_per_commitment_secret,byte,32
  msgdata,channel_reestablish,my_current_per_commitment_point,point,
@@ -13,9 +13,6 @@
 +tlvdata,channel_reestablish_tlvs,current_type,type,channel_type,
 +tlvtype,channel_reestablish_tlvs,upgradable,7
 +tlvdata,channel_reestablish_tlvs,upgradable,upgrades,channel_type,...
-+subtype,channel_type
-+subtypedata,channel_type,len,u16,
-+subtypedata,channel_type,features,byte,len
  msgtype,announcement_signatures,259
  msgdata,announcement_signatures,channel_id,channel_id,
  msgdata,announcement_signatures,short_channel_id,short_channel_id,