diff --git a/Makefile b/Makefile
index dd3917b486be..d5301a9e919d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../lightning-rfc/
-BOLTVERSION := 6f6ea63233c56f14c04de6cf0ec1e4f0e91c1ead
+BOLTVERSION := 636b9f2e28c5eb9564b50b85ac85e23fc2176623
 
 -include config.vars
 
diff --git a/bitcoin/script.c b/bitcoin/script.c
index 33e2714696b8..58cdd4e197c9 100644
--- a/bitcoin/script.c
+++ b/bitcoin/script.c
@@ -454,7 +454,7 @@ u8 **bitcoin_witness_sig_and_element(const tal_t *ctx,
 /* BOLT #3:
  *
  * This output sends funds back to the owner of this commitment transaction and
- * thus must be timelocked using `OP_CSV`. It can be claimed, without delay,
+ * thus must be timelocked using `OP_CHECKSEQUENCEVERIFY`. It can be claimed, without delay,
  * by the other party if they know the revocation private key. The output is a
  * version-0 P2WSH, with a witness script:
  *
@@ -463,7 +463,7 @@ u8 **bitcoin_witness_sig_and_element(const tal_t *ctx,
  *         <revocationpubkey>
  *     OP_ELSE
  *         `to_self_delay`
- *         OP_CSV
+ *         OP_CHECKSEQUENCEVERIFY
  *         OP_DROP
  *         <local_delayedpubkey>
  *     OP_ENDIF
@@ -706,7 +706,7 @@ u8 *bitcoin_wscript_htlc_tx(const tal_t *ctx,
 	 *         <revocationpubkey>
 	 *     OP_ELSE
 	 *         `to_self_delay`
-	 *         OP_CSV
+	 *         OP_CHECKSEQUENCEVERIFY
 	 *         OP_DROP
 	 *         <local_delayedpubkey>
 	 *     OP_ENDIF