diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c
index c16471e96..3432c3ac4 100644
--- a/lightningd/channel_control.c
+++ b/lightningd/channel_control.c
@@ -415,7 +415,7 @@ static unsigned channel_msg(struct subd *sd, const u8 *msg, const int *fds)
 
 void peer_start_channeld(struct channel *channel,
 			 struct per_peer_state *pps,
-			 const u8 *funding_signed,
+			 const u8 **fwd_msgs,
 			 bool reconnected)
 {
 	u8 *initmsg;
@@ -556,7 +556,8 @@ void peer_start_channeld(struct channel *channel,
 				      channel->shutdown_scriptpubkey[REMOTE] != NULL,
 				      channel->shutdown_scriptpubkey[LOCAL],
 				      channel->channel_flags,
-				      funding_signed,
+				      /* FIXME: pass set of msgs */
+				      fwd_msgs ? fwd_msgs[0] : NULL,
 				      reached_announce_depth,
 				      &last_remote_per_commit_secret,
 				      channel->peer->their_features,
diff --git a/lightningd/channel_control.h b/lightningd/channel_control.h
index 016b2e6d1..6d0052de6 100644
--- a/lightningd/channel_control.h
+++ b/lightningd/channel_control.h
@@ -12,7 +12,7 @@ struct peer;
 
 void peer_start_channeld(struct channel *channel,
 			 struct per_peer_state *pps,
-			 const u8 *funding_signed,
+			 const u8 **fwd_msgs,
 			 bool reconnected);
 
 /* Returns true if subd told, otherwise false. */
diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c
index 63d84ed57..26e9ecc91 100644
--- a/lightningd/opening_control.c
+++ b/lightningd/opening_control.c
@@ -418,7 +418,7 @@ static void opening_fundee_finished(struct subd *openingd,
 				    const int *fds,
 				    struct uncommitted_channel *uc)
 {
-	u8 *funding_signed;
+	const u8 *msgs[1];
 	struct channel_info channel_info;
 	struct bitcoin_signature remote_commit_sig;
 	struct bitcoin_tx *remote_commit;
@@ -458,7 +458,7 @@ static void opening_fundee_finished(struct subd *openingd,
 				     &push,
 				     &channel_flags,
 				     &feerate,
-				     &funding_signed,
+				     cast_const2(u8 **, msgs),
 				     &uc->our_config.channel_reserve,
 				     &local_upfront_shutdown_script,
 				     &remote_upfront_shutdown_script)) {
@@ -516,7 +516,7 @@ static void opening_fundee_finished(struct subd *openingd,
 		wallet_penalty_base_add(ld->wallet, channel->dbid, pbase);
 
 	/* On to normal operation! */
-	peer_start_channeld(channel, pps, funding_signed, false);
+	peer_start_channeld(channel, pps, msgs, false);
 
 	subd_release_channel(openingd, uc);
 	uc->open_daemon = NULL;
diff --git a/lightningd/test/run-invoice-select-inchan.c b/lightningd/test/run-invoice-select-inchan.c
index f9327a138..bac0aa7fc 100644
--- a/lightningd/test/run-invoice-select-inchan.c
+++ b/lightningd/test/run-invoice-select-inchan.c
@@ -461,7 +461,7 @@ struct channel *peer_normal_channel(struct peer *peer UNNEEDED)
 /* Generated stub for peer_start_channeld */
 void peer_start_channeld(struct channel *channel UNNEEDED,
 			 struct per_peer_state *pps UNNEEDED,
-			 const u8 *funding_signed UNNEEDED,
+			 const u8 **fwd_msgs UNNEEDED,
 			 bool reconnected UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
 /* Generated stub for peer_start_closingd */
diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c
index b45381500..f67640b77 100644
--- a/wallet/db_postgres_sqlgen.c
+++ b/wallet/db_postgres_sqlgen.c
@@ -1648,4 +1648,4 @@ struct db_query db_postgres_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */
 
-// SHA256STAMP:d9e28ea3b9764c7f3d5cc2bba2ac18493fc00bb42d13e94d0589824512aa1e01
+// SHA256STAMP:765807f84044cf41f5bed6300b9bbf280d0828e9d8eae183d832f7d7608a956d
diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c
index e4d9bee2b..2a9ad8b26 100644
--- a/wallet/db_sqlite3_sqlgen.c
+++ b/wallet/db_sqlite3_sqlgen.c
@@ -1648,4 +1648,4 @@ struct db_query db_sqlite3_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */
 
-// SHA256STAMP:d9e28ea3b9764c7f3d5cc2bba2ac18493fc00bb42d13e94d0589824512aa1e01
+// SHA256STAMP:765807f84044cf41f5bed6300b9bbf280d0828e9d8eae183d832f7d7608a956d
diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po
index 915f4a992..c172addec 100644
--- a/wallet/statements_gettextgen.po
+++ b/wallet/statements_gettextgen.po
@@ -1085,4 +1085,4 @@ msgstr ""
 #: wallet/test/run-wallet.c:1345
 msgid "INSERT INTO channels (id) VALUES (1);"
 msgstr ""
-#  SHA256STAMP:c4174faa4e7db5644e1fa34f7c891563ec9697b003d415e91ab256b21462c398
+#  SHA256STAMP:28870591d46cd24796c8d9b30f76ac5dc91840cf1a70111b0e23c814dd5cc411
diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
index fa70120ce..ab93772b5 100644
--- a/wallet/test/run-wallet.c
+++ b/wallet/test/run-wallet.c
@@ -568,7 +568,7 @@ void peer_memleak_done(struct command *cmd UNNEEDED, struct subd *leaker UNNEEDE
 /* Generated stub for peer_start_channeld */
 void peer_start_channeld(struct channel *channel UNNEEDED,
 			 struct per_peer_state *pps UNNEEDED,
-			 const u8 *funding_signed UNNEEDED,
+			 const u8 **fwd_msgs UNNEEDED,
 			 bool reconnected UNNEEDED)
 { fprintf(stderr, "peer_start_channeld called!\n"); abort(); }
 /* Generated stub for peer_start_closingd */