diff --git a/Makefile b/Makefile
index 38959a1cf..cedd88fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := 5dec5eb84957d70c9fedf27173e78f1b0b6b0217
+DEFAULT_BOLTVERSION := fd83d7cee0369eb1d9068eb9864bff8b1f940938
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 
diff --git a/common/key_derive.c b/common/key_derive.c
index c6daa68c5..07c74614e 100644
--- a/common/key_derive.c
+++ b/common/key_derive.c
@@ -13,12 +13,11 @@
  *
  *	pubkey = basepoint + SHA256(per_commitment_point || basepoint) * G
  *
- * The `localpubkey` uses the local node's `payment_basepoint`;
- * The `remotepubkey` uses the remote node's `payment_basepoint`;
- * the `local_htlcpubkey` uses the local node's `htlc_basepoint`;
- * the `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
- * the `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
- * and the `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
+ * - The `localpubkey` uses the local node's `payment_basepoint`;
+ * - The `local_htlcpubkey` uses the local node's `htlc_basepoint`;
+ * - The `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
+ * - The `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
+ * - The `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
  *...
  * The `remotepubkey` is simply the remote node's `payment_basepoint`.
  */
diff --git a/common/keyset.c b/common/keyset.c
index 8e688a6ca..f30536a27 100644
--- a/common/keyset.c
+++ b/common/keyset.c
@@ -17,12 +17,11 @@ bool derive_keyset(const struct pubkey *per_commitment_point,
 	 *
 	 *	pubkey = basepoint + SHA256(per_commitment_point || basepoint) * G
 	 *
-	 * The `localpubkey` uses the local node's `payment_basepoint`;
- * The `remotepubkey` uses the remote node's `payment_basepoint`;
-	 * the `local_htlcpubkey` uses the local node's `htlc_basepoint`;
-	 * the `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
-	 * the `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
-	 * and the `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
+	 * - The `localpubkey` uses the local node's `payment_basepoint`;
+	 * - The `local_htlcpubkey` uses the local node's `htlc_basepoint`;
+	 * - The `remote_htlcpubkey` uses the remote node's `htlc_basepoint`;
+	 * - The `local_delayedpubkey` uses the local node's `delayed_payment_basepoint`;
+	 * - The `remote_delayedpubkey` uses the remote node's `delayed_payment_basepoint`.
 	 */
 	if (!derive_simple_key(&self->payment,
 			       per_commitment_point,