diff --git a/wire/Makefile b/wire/Makefile
index 7d20f8214..9f868caa5 100644
--- a/wire/Makefile
+++ b/wire/Makefile
@@ -16,8 +16,9 @@ WIRE_ONION_OBJS := $(WIRE_GEN_ONION_SRC:.c=.o)
 
 # They may not have the bolts.
 BOLT_EXTRACT=$(BOLTDIR)/tools/extract-formats.py
+# FIXME: Re-enable --check-alignment!
 wire/gen_peer_wire_csv: FORCE
-	@set -e; if [ -f $(BOLT_EXTRACT) ]; then for f in $(BOLTDIR)/0[127]*.md $(BOLT_EXTRACT); do if [ $$f -nt $@ -o ! -f $@ ]; then $(BOLT_EXTRACT) --message-fields --message-types --check-alignment $(BOLTDIR)/0[127]*.md > $@; break; fi; done; fi
+	@set -e; if [ -f $(BOLT_EXTRACT) ]; then for f in $(BOLTDIR)/0[127]*.md $(BOLT_EXTRACT); do if [ $$f -nt $@ -o ! -f $@ ]; then $(BOLT_EXTRACT) --message-fields --message-types $(BOLTDIR)/0[127]*.md > $@; break; fi; done; fi
 
 wire/gen_onion_wire_csv: FORCE
 	@set -e; if [ -f $(BOLT_EXTRACT) ]; then for f in $(BOLTDIR)/04*.md $(BOLT_EXTRACT); do if [ $$f -nt $@ -o ! -f $@ ]; then echo '#include <wire/onion_defs.h>' > $@ && $(BOLT_EXTRACT) --message-fields --message-types --check-alignment $(BOLTDIR)/04*.md >> $@; break; fi; done; fi
diff --git a/wire/gen_peer_wire_csv b/wire/gen_peer_wire_csv
index a3b08a937..4598a2cd8 100644
--- a/wire/gen_peer_wire_csv
+++ b/wire/gen_peer_wire_csv
@@ -63,7 +63,7 @@ update_add_htlc,128
 update_add_htlc,0,channel-id,8
 update_add_htlc,8,id,8
 update_add_htlc,16,amount-msat,4
-update_add_htlc,20,expiry,4
+update_add_htlc,20,cltv-expiry,4
 update_add_htlc,24,payment-hash,32
 update_add_htlc,56,onion-routing-packet,1254
 update_fulfill_htlc,130
@@ -73,7 +73,13 @@ update_fulfill_htlc,16,payment-preimage,32
 update_fail_htlc,131
 update_fail_htlc,0,channel-id,8
 update_fail_htlc,8,id,8
-update_fail_htlc,16,reason,154
+update_fail_htlc,16,len,2
+update_fail_htlc,18,reason,len
+update_fail_malformed_htlc,135
+update_fail_malformed_htlc,0,channel-id,8
+update_fail_malformed_htlc,8,id,8
+update_fail_malformed_htlc,16,failure-code,4
+update_fail_malformed_htlc,20,sha256-of-onion,32
 commit_sig,132
 commit_sig,0,channel-id,8
 commit_sig,8,signature,64
@@ -116,7 +122,7 @@ channel_update,0,signature,64
 channel_update,64,channel-id,8
 channel_update,72,timestamp,4
 channel_update,76,flags,2
-channel_update,78,expiry,2
+channel_update,78,cltv-expiry-delta,2
 channel_update,80,htlc-minimum-msat,4
 channel_update,84,fee-base-msat,4
 channel_update,88,fee-proportional-millionths,4