diff --git a/channeld/channeld.c b/channeld/channeld.c
index ad46dc72da75..b0942d21b3a4 100644
--- a/channeld/channeld.c
+++ b/channeld/channeld.c
@@ -793,18 +793,24 @@ static u8 *wait_sync_reply(const tal_t *ctx,
 	status_trace("... , awaiting %u", replytype);
 
 	for (;;) {
+		int type;
+
 		reply = wire_sync_read(ctx, fd);
 		if (!reply)
 			status_failed(STATUS_FAIL_INTERNAL_ERROR,
 				      "Could not set sync read from %s: %s",
 				      who, strerror(errno));
-		if (fromwire_peektype(reply) == replytype) {
+		type = fromwire_peektype(reply);
+		if (type == replytype) {
 			status_trace("Got it!");
 			break;
 		}
 
-		status_trace("Nope, got %u instead", fromwire_peektype(reply));
+		status_trace("Nope, got %u instead", type);
 		msg_enqueue(queue, take(reply));
+		/* This one has an fd appended */
+		if (type == WIRE_GOSSIPD_NEW_STORE_FD)
+			msg_enqueue_fd(queue, fdpass_recv(fd));
 	}
 
 	return reply;
@@ -3052,6 +3058,14 @@ int main(int argc, char *argv[])
 
 		msg = msg_dequeue(peer->from_gossipd);
 		if (msg) {
+			if (fromwire_gossipd_new_store_fd(msg)) {
+				tal_free(msg);
+				msg = msg_dequeue(peer->from_gossipd);
+				new_gossip_store(GOSSIP_STORE_FD,
+						 msg_extract_fd(msg));
+				tal_free(msg);
+				continue;
+			}
 			status_trace("Now dealing with deferred gossip %u",
 				     fromwire_peektype(msg));
 			handle_gossip_msg(PEER_FD, &peer->cs, take(msg));
@@ -3091,6 +3105,12 @@ int main(int argc, char *argv[])
 			 * connection comes in. */
 			if (!msg)
 				peer_failed_connection_lost();
+			if (fromwire_gossipd_new_store_fd(msg)) {
+				tal_free(msg);
+				new_gossip_store(GOSSIP_STORE_FD,
+						 fdpass_recv(GOSSIP_FD));
+				continue;
+			}
 			handle_gossip_msg(PEER_FD, &peer->cs, take(msg));
 		}
 	}
diff --git a/closingd/closingd.c b/closingd/closingd.c
index f0c13be6958e..851dde56e239 100644
--- a/closingd/closingd.c
+++ b/closingd/closingd.c
@@ -1,4 +1,5 @@
 #include <bitcoin/script.h>
+#include <ccan/fdpass/fdpass.h>
 #include <closingd/gen_closing_wire.h>
 #include <common/close_tx.h>
 #include <common/crypto_sync.h>
@@ -16,6 +17,7 @@
 #include <common/version.h>
 #include <common/wire_error.h>
 #include <errno.h>
+#include <gossipd/gen_gossip_peerd_wire.h>
 #include <hsmd/gen_hsm_wire.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ -99,6 +101,12 @@ static u8 *closing_read_peer_msg(const tal_t *ctx,
 		msg = peer_or_gossip_sync_read(ctx, PEER_FD, GOSSIP_FD,
 					       cs, &from_gossipd);
 		if (from_gossipd) {
+			if (fromwire_gossipd_new_store_fd(msg)) {
+				tal_free(msg);
+				new_gossip_store(GOSSIP_STORE_FD,
+						 fdpass_recv(GOSSIP_FD));
+				continue;
+			}
 			handle_gossip_msg(PEER_FD, cs, take(msg));
 			continue;
 		}
diff --git a/common/read_peer_msg.c b/common/read_peer_msg.c
index ca15059a2cec..27018c158b77 100644
--- a/common/read_peer_msg.c
+++ b/common/read_peer_msg.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <gossipd/gen_gossip_peerd_wire.h>
 #include <sys/select.h>
+#include <unistd.h>
 #include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
@@ -152,3 +153,12 @@ bool handle_peer_gossip_or_error(int peer_fd, int gossip_fd, int gossip_store_fd
 		tal_free(msg);
 	return true;
 }
+
+void new_gossip_store(int gossip_store_fd, int new_gossip_store_fd)
+{
+	if (dup2(new_gossip_store_fd, gossip_store_fd) == -1)
+		status_failed(STATUS_FAIL_INTERNAL_ERROR,
+			      "Could not dup2 new fd %i onto %i: %s",
+			      new_gossip_store_fd, gossip_store_fd,
+			      strerror(errno));
+}
diff --git a/common/read_peer_msg.h b/common/read_peer_msg.h
index 9a0ae2e09091..d6adb92b2846 100644
--- a/common/read_peer_msg.h
+++ b/common/read_peer_msg.h
@@ -74,4 +74,10 @@ bool handle_peer_gossip_or_error(int peer_fd, int gossip_fd, int gossip_store_fd
 void handle_gossip_msg(int peer_fd, struct crypto_state *cs,
 		       const u8 *msg TAKES);
 
+/**
+ * new_gossip_store - handle replacement gossip_store_fd.
+ * @gossip_store_fd: our fixed fd we expect to use to read gossip_store.
+ * @new_gossip_store_fd: fd received from gossipd.
+ */
+void new_gossip_store(int gossip_store_fd, int new_gossip_store_fd);
 #endif /* LIGHTNING_COMMON_READ_PEER_MSG_H */
diff --git a/gossipd/broadcast.c b/gossipd/broadcast.c
index 650f7a609e5a..f0d8d2585aac 100644
--- a/gossipd/broadcast.c
+++ b/gossipd/broadcast.c
@@ -85,8 +85,7 @@ void insert_broadcast(struct broadcast_state **bstate,
 	insert_broadcast_nostore(*bstate, bcast);
 
 	/* If it compacts, it replaces *bstate */
-	gossip_store_maybe_compact((*bstate)->gs, bstate, &offset);
-	if (offset)
+	if (gossip_store_maybe_compact((*bstate)->gs, bstate, &offset))
 		update_peers_broadcast_index((*bstate)->peers, offset);
 }
 
diff --git a/gossipd/gossip_peerd_wire.csv b/gossipd/gossip_peerd_wire.csv
index df429809f515..241733151179 100644
--- a/gossipd/gossip_peerd_wire.csv
+++ b/gossipd/gossip_peerd_wire.csv
@@ -30,3 +30,6 @@ gossipd_local_channel_update,,htlc_minimum_msat,struct amount_msat
 gossipd_local_channel_update,,fee_base_msat,u32
 gossipd_local_channel_update,,fee_proportional_millionths,u32
 gossipd_local_channel_update,,htlc_maximum_msat,struct amount_msat
+
+# Update your gossip_store fd: + gossip_store_fd
+gossipd_new_store_fd,3505
diff --git a/gossipd/gossip_store.c b/gossipd/gossip_store.c
index 7a9c5938830f..ef8bf97ab3ce 100644
--- a/gossipd/gossip_store.c
+++ b/gossipd/gossip_store.c
@@ -476,7 +476,7 @@ bool gossip_store_compact(struct gossip_store *gs,
 	return false;
 }
 
-void gossip_store_maybe_compact(struct gossip_store *gs,
+bool gossip_store_maybe_compact(struct gossip_store *gs,
 				struct broadcast_state **bs,
 				u32 *offset)
 {
@@ -484,13 +484,13 @@ void gossip_store_maybe_compact(struct gossip_store *gs,
 
 	/* Don't compact while loading! */
 	if (!gs->writable)
-		return;
+		return false;
 	if (gs->count < 1000)
-		return;
+		return false;
 	if (gs->count < (*bs)->count * 1.25)
-		return;
+		return false;
 
-	gossip_store_compact(gs, bs, offset);
+	return gossip_store_compact(gs, bs, offset);
 }
 
 u64 gossip_store_add(struct gossip_store *gs, const u8 *gossip_msg,
diff --git a/gossipd/gossip_store.h b/gossipd/gossip_store.h
index 8584d4b7fbe8..819657310182 100644
--- a/gossipd/gossip_store.h
+++ b/gossipd/gossip_store.h
@@ -54,9 +54,9 @@ const u8 *gossip_store_get(const tal_t *ctx,
  * @bs: a pointer to the broadcast state: replaced if we compact it.
  * @offset: the change in the store, if any.
  *
- * If @offset is non-zero on return, caller must update peers.
+ * If return value is true, caller must update peers.
  */
-void gossip_store_maybe_compact(struct gossip_store *gs,
+bool gossip_store_maybe_compact(struct gossip_store *gs,
 				struct broadcast_state **bs,
 				u32 *offset);
 
diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
index 915ce4f5b40b..199ca6d3d893 100644
--- a/gossipd/gossipd.c
+++ b/gossipd/gossipd.c
@@ -700,13 +700,28 @@ static u8 *handle_gossip_timestamp_filter(struct peer *peer, const u8 *msg)
  * some, but that's a lesser evil than skipping some. */
 void update_peers_broadcast_index(struct list_head *peers, u32 offset)
 {
-	struct peer *peer;
+	struct peer *peer, *next;
 
-	list_for_each(peers, peer, list) {
+	list_for_each_safe(peers, peer, next, list) {
+		int gs_fd;
 		if (peer->broadcast_index < offset)
 			peer->broadcast_index = 0;
 		else
 			peer->broadcast_index -= offset;
+
+		/*~ Since store has been compacted, they need a new fd for the
+		 * new store.  The only one will still work, but after this
+		 * any offsets will refer to the new store. */
+		gs_fd = gossip_store_readonly_fd(peer->daemon->rstate->broadcasts->gs);
+		if (gs_fd < 0) {
+			status_broken("Can't get read-only gossip store fd:"
+				      " killing peer");
+			tal_free(peer);
+		} else {
+			u8 *msg = towire_gossipd_new_store_fd(NULL);
+			daemon_conn_send(peer->dc, take(msg));
+			daemon_conn_send_fd(peer->dc, gs_fd);
+		}
 	}
 }
 
@@ -1670,6 +1685,7 @@ static struct io_plan *peer_msg_in(struct io_conn *conn,
 	/* These are the ones we send, not them */
 	case WIRE_GOSSIPD_GET_UPDATE_REPLY:
 	case WIRE_GOSSIPD_SEND_GOSSIP:
+	case WIRE_GOSSIPD_NEW_STORE_FD:
 		break;
 	}
 
diff --git a/openingd/openingd.c b/openingd/openingd.c
index 886b3a9f6491..3f6574ce4bf1 100644
--- a/openingd/openingd.c
+++ b/openingd/openingd.c
@@ -35,6 +35,7 @@
 #include <common/version.h>
 #include <common/wire_error.h>
 #include <errno.h>
+#include <gossipd/gen_gossip_peerd_wire.h>
 #include <hsmd/gen_hsm_wire.h>
 #include <inttypes.h>
 #include <openingd/gen_opening_wire.h>
@@ -376,6 +377,12 @@ static u8 *opening_negotiate_msg(const tal_t *ctx, struct state *state,
 		/* Use standard helper for gossip msgs (forwards, if it's an
 		 * error, exits). */
 		if (from_gossipd) {
+			if (fromwire_gossipd_new_store_fd(msg)) {
+				tal_free(msg);
+				new_gossip_store(GOSSIP_STORE_FD,
+						 fdpass_recv(GOSSIP_FD));
+				continue;
+			}
 			handle_gossip_msg(PEER_FD, &state->cs, take(msg));
 			continue;
 		}