diff --git a/Makefile b/Makefile
index 3d11b3299ba0..6c8a99fef662 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := bc86304b4b0af5fd5ce9d24f74e2ebbceb7e2730
+DEFAULT_BOLTVERSION := 2ecc091f3484f7a3450e7f5543ae851edd1e0761
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 
diff --git a/common/gossip_constants.h b/common/gossip_constants.h
index 3ce395eac70e..436db62a4ab6 100644
--- a/common/gossip_constants.h
+++ b/common/gossip_constants.h
@@ -62,7 +62,7 @@
 /* BOLT #7:
  *
  * A node:
- *   - if a channel's oldest `channel_update`s `timestamp` is older than two weeks
+ *   - if a channel's latest `channel_update`s `timestamp` is older than two weeks
  *   (1209600 seconds):
  *     - MAY prune the channel.
  *     - MAY ignore the channel.
diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
index 8c42eec96bc7..84a588775b46 100644
--- a/gossipd/gossipd.c
+++ b/gossipd/gossipd.c
@@ -606,7 +606,7 @@ static struct io_plan *connectd_req(struct io_conn *conn,
 /* BOLT #7:
  *
  * A node:
- *  - if a channel's oldest `channel_update`s `timestamp` is older than two weeks
+ *  - if a channel's latest `channel_update`s `timestamp` is older than two weeks
  *    (1209600 seconds):
  *     - MAY prune the channel.
  *     - MAY ignore the channel.
diff --git a/gossipd/routing.c b/gossipd/routing.c
index 6bdc0020d64f..253fffd06ea6 100644
--- a/gossipd/routing.c
+++ b/gossipd/routing.c
@@ -1926,10 +1926,12 @@ void route_prune(struct routing_state *rstate)
 			continue;
 
 		/* BOLT #7:
-		 *   - if a channel's oldest `channel_update`s `timestamp` is
+		 *   - if a channel's latest `channel_update`s `timestamp` is
 		 *     older than two weeks (1209600 seconds):
 		 *    - MAY prune the channel.
 		 */
+		/* FIXME: I disagree with the above quote: it used to say "oldest", which is what we
+		   use here: */
 		/* This is a fancy way of saying "both ends must refresh!" */
 		if (!is_halfchan_defined(&chan->half[0])
 		    || chan->half[0].bcast.timestamp < highwater