diff --git a/channeld/channeld.c b/channeld/channeld.c
index febdd6cfc..ccf4325cf 100644
--- a/channeld/channeld.c
+++ b/channeld/channeld.c
@@ -957,6 +957,10 @@ static u8 *make_failmsg(const tal_t *ctx,
 	case WIRE_INVALID_ONION_KEY:
 		msg = towire_invalid_onion_key(ctx, sha256);
 		goto done;
+	case WIRE_INVALID_ONION_PAYLOAD:
+		/* FIXME: wire this into tlv parser somehow. */
+		msg = towire_invalid_onion_payload(ctx, 0, 0);
+		goto done;
 	}
 	status_failed(STATUS_FAIL_INTERNAL_ERROR,
 		      "Asked to create failmsg %u (%s)",
diff --git a/wire/extracted_onion_wire_csv b/wire/extracted_onion_wire_csv
index 602599a4f..01576187d 100644
--- a/wire/extracted_onion_wire_csv
+++ b/wire/extracted_onion_wire_csv
@@ -45,3 +45,6 @@ msgtype,final_incorrect_htlc_amount,19
 msgdata,final_incorrect_htlc_amount,incoming_htlc_amt,u64,
 msgtype,channel_disabled,UPDATE|20
 msgtype,expiry_too_far,21
+msgtype,invalid_onion_payload,PERM|22
+msgdata,invalid_onion_payload,type,varint,
+msgdata,invalid_onion_payload,offset,u16,