diff --git a/Makefile b/Makefile
index 6683a8e25d21..241f707df174 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := df4af02eb1028b6da2d3bce792052f27ea92f774
+DEFAULT_BOLTVERSION := aa5207aeaa32d841353dd2df3ce725a4046d528d
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 
diff --git a/wire/extracted_onion_02_offers.patch b/wire/extracted_onion_02_offers.patch
deleted file mode 100644
index 07103ee200d7..000000000000
--- a/wire/extracted_onion_02_offers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv
-index ae05f09fd..b09811ed1 100644
---- a/wire/onion_wire.csv
-+++ b/wire/onion_wire.csv
-@@ -92,3 +92,9 @@ tlvtype,onionmsg_tlv,reply_path,2
- tlvdata,onionmsg_tlv,reply_path,path,blinded_path,
- tlvtype,onionmsg_tlv,encrypted_recipient_data,4
- tlvdata,onionmsg_tlv,encrypted_recipient_data,encrypted_recipient_data,byte,...
-+tlvtype,onionmsg_tlv,invoice_request,64
-+tlvdata,onionmsg_tlv,invoice_request,invoice_request,tlv_invoice_request,
-+tlvtype,onionmsg_tlv,invoice,66
-+tlvdata,onionmsg_tlv,invoice,invoice,tlv_invoice,
-+tlvtype,onionmsg_tlv,invoice_error,68
-+tlvdata,onionmsg_tlv,invoice_error,invoice_error,tlv_invoice_error,
diff --git a/wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch b/wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch
index 55dce3419ac9..82e0b2e280b2 100644
--- a/wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch
+++ b/wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch
@@ -8,11 +8,11 @@ index 5c52fe9a1..2ac0c4cff 100644
  tlvtype,onionmsg_tlv,encrypted_data_tlv,4
  tlvdata,onionmsg_tlv,encrypted_data_tlv,encrypted_data_tlv,byte,...
  tlvtype,onionmsg_tlv,invoice_request,64
--tlvdata,onionmsg_tlv,invoice_request,invoice_request,tlv_invoice_request,
-+tlvdata,onionmsg_tlv,invoice_request,invoice_request,byte,...
+-tlvdata,onionmsg_tlv,invoice_request,invreq,tlv_invoice_request,
++tlvdata,onionmsg_tlv,invoice_request,invreq,byte,...
  tlvtype,onionmsg_tlv,invoice,66
--tlvdata,onionmsg_tlv,invoice,invoice,tlv_invoice,
-+tlvdata,onionmsg_tlv,invoice,invoice,byte,...
+-tlvdata,onionmsg_tlv,invoice,inv,tlv_invoice,
++tlvdata,onionmsg_tlv,invoice,inv,byte,...
  tlvtype,onionmsg_tlv,invoice_error,68
--tlvdata,onionmsg_tlv,invoice_error,invoice_error,tlv_invoice_error,
-+tlvdata,onionmsg_tlv,invoice_error,invoice_error,byte,...
+-tlvdata,onionmsg_tlv,invoice_error,inverr,tlv_invoice_error,
++tlvdata,onionmsg_tlv,invoice_error,inverr,byte,...
diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv
index 07b068b86350..e3f313cf6a65 100644
--- a/wire/onion_wire.csv
+++ b/wire/onion_wire.csv
@@ -97,8 +97,8 @@ tlvdata,onionmsg_tlv,reply_path,path,blinded_path,
 tlvtype,onionmsg_tlv,encrypted_recipient_data,4
 tlvdata,onionmsg_tlv,encrypted_recipient_data,encrypted_recipient_data,byte,...
 tlvtype,onionmsg_tlv,invoice_request,64
-tlvdata,onionmsg_tlv,invoice_request,invoice_request,byte,...
+tlvdata,onionmsg_tlv,invoice_request,invreq,byte,...
 tlvtype,onionmsg_tlv,invoice,66
-tlvdata,onionmsg_tlv,invoice,invoice,byte,...
+tlvdata,onionmsg_tlv,invoice,inv,byte,...
 tlvtype,onionmsg_tlv,invoice_error,68
-tlvdata,onionmsg_tlv,invoice_error,invoice_error,byte,...
+tlvdata,onionmsg_tlv,invoice_error,inverr,byte,...