diff --git a/wallet/wallet.c b/wallet/wallet.c
index 26e0676d7..a298e36fc 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -404,6 +404,7 @@ static bool wallet_stmt2channel(struct wallet *w, sqlite3_stmt *stmt,
 	struct channel_info *channel_info;
 	struct sha256_double temphash;
 	struct short_channel_id scid;
+	u64 remote_config_id;
 
 	if (!chan->peer) {
 		chan->peer = talz(chan, struct peer);
@@ -420,7 +421,9 @@ static bool wallet_stmt2channel(struct wallet *w, sqlite3_stmt *stmt,
 	}
 
 	/* TODO(cdecker) Load channel configs into chan */
-	col += 2;
+	chan->peer->our_config.id = sqlite3_column_int64(stmt, col++);
+	wallet_channel_config_load(w, chan->peer->our_config.id, &chan->peer->our_config);
+	remote_config_id = sqlite3_column_int64(stmt, col++);
 
 	chan->peer->state = sqlite3_column_int(stmt, col++);
 	chan->peer->funder = sqlite3_column_int(stmt, col++);
@@ -471,6 +474,7 @@ static bool wallet_stmt2channel(struct wallet *w, sqlite3_stmt *stmt,
 		ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->remote_per_commit);
 		ok &= sqlite3_column_pubkey(stmt, col++, &channel_info->old_remote_per_commit);
 		channel_info->feerate_per_kw = sqlite3_column_int64(stmt, col++);
+		wallet_channel_config_load(w, remote_config_id, &chan->peer->channel_info->their_config);
 	} else {
 		/* No channel_info, skip positions in the result */
 		col += 8;
@@ -636,6 +640,8 @@ bool wallet_channel_save(struct wallet *w, struct wallet_channel *chan){
 		ok &= wallet_shachain_init(w, &p->their_shachain);
 	}
 
+	ok &= wallet_channel_config_save(w, &p->our_config);
+
 	/* Now do the real update */
 	ok &= db_exec(__func__, w->db, "UPDATE channels SET"
 		      "  shachain_remote_id=%"PRIu64","
@@ -655,7 +661,8 @@ bool wallet_channel_save(struct wallet *w, struct wallet_channel *chan){
 		      "  push_msatoshi=%"PRIu64","
 		      "  msatoshi_local=%s,"
 		      "  shutdown_scriptpubkey_remote='%s',"
-		      "  shutdown_keyidx_local=%"PRIu64""
+		      "  shutdown_keyidx_local=%"PRIu64","
+		      "  channel_config_local=%"PRIu64
 		      " WHERE id=%"PRIu64,
 		      p->their_shachain.id,
 		      p->scid?tal_fmt(tmpctx,"'%s'", short_channel_id_to_str(tmpctx, p->scid)):"null",
@@ -675,9 +682,11 @@ bool wallet_channel_save(struct wallet *w, struct wallet_channel *chan){
 		      p->our_msatoshi?tal_fmt(tmpctx, "%"PRIu64, *p->our_msatoshi):"NULL",
 		      p->remote_shutdown_scriptpubkey?tal_hex(tmpctx, p->remote_shutdown_scriptpubkey):"",
 		      p->local_shutdown_idx,
+		      p->our_config.id,
 		      chan->id);
 
 	if (chan->peer->channel_info) {
+		ok &= wallet_channel_config_save(w, &p->channel_info->their_config);
 		ok &= db_exec(__func__, w->db,
 			      "UPDATE channels SET"
 			      "  commit_sig_remote=%s,"
@@ -687,7 +696,8 @@ bool wallet_channel_save(struct wallet *w, struct wallet_channel *chan){
 			      "  delayed_payment_basepoint_remote='%s',"
 			      "  per_commit_remote='%s',"
 			      "  old_per_commit_remote='%s',"
-			      "  feerate_per_kw=%d"
+			      "  feerate_per_kw=%d,"
+			      "  channel_config_remote=%"PRIu64
 			      " WHERE id=%"PRIu64,
 			      db_serialize_signature(tmpctx, &p->channel_info->commit_sig),
 			      db_serialize_pubkey(tmpctx, &p->channel_info->remote_fundingkey),
@@ -697,6 +707,7 @@ bool wallet_channel_save(struct wallet *w, struct wallet_channel *chan){
 			      db_serialize_pubkey(tmpctx, &p->channel_info->remote_per_commit),
 			      db_serialize_pubkey(tmpctx, &p->channel_info->old_remote_per_commit),
 			      p->channel_info->feerate_per_kw,
+			      p->channel_info->their_config.id,
 			      chan->id);
 	}
 
diff --git a/wallet/wallet_tests.c b/wallet/wallet_tests.c
index efc4ca7de..8f4e2e9d6 100644
--- a/wallet/wallet_tests.c
+++ b/wallet/wallet_tests.c
@@ -144,8 +144,10 @@ static bool channelseq(struct wallet_channel *c1, struct wallet_channel *c2)
 		CHECK(pubkey_eq(&ci1->theirbase.delayed_payment, &ci2->theirbase.delayed_payment));
 		CHECK(pubkey_eq(&ci1->remote_per_commit, &ci2->remote_per_commit));
 		CHECK(pubkey_eq(&ci1->old_remote_per_commit, &ci2->old_remote_per_commit));
+		CHECK(ci1->their_config.id != 0 && ci1->their_config.id == ci2->their_config.id);
 	}
 
+	CHECK(p1->our_config.id != 0 && p1->our_config.id == p2->our_config.id);
 	CHECK((lc1 != NULL) ==  (lc2 != NULL));
 	if(lc1) {
 		CHECK(lc1->newstate == lc2->newstate);
@@ -155,11 +157,9 @@ static bool channelseq(struct wallet_channel *c1, struct wallet_channel *c2)
 	return true;
 }
 
-static bool test_channel_crud(void)
+static bool test_channel_crud(const tal_t *ctx)
 {
-	char filename[] = "/tmp/ldb-XXXXXX";
-	int fd = mkstemp(filename);
-	struct wallet *w = tal(NULL, struct wallet);
+	struct wallet *w = create_test_wallet(ctx);
 	struct wallet_channel c1, *c2 = tal(w, struct wallet_channel);
 	struct peer p;
 	struct channel_info ci;
@@ -169,13 +169,6 @@ static bool test_channel_crud(void)
 
 	u64 msat = 12345;
 
-	w->db = db_open(w, filename);
-	CHECK_MSG(w->db, "Failed opening the db");
-	CHECK_MSG(db_migrate(w->db), "DB migration failed");
-
-	CHECK_MSG(fd != -1, "Unable to generate temp filename");
-	close(fd);
-
 	memset(&c1, 0, sizeof(c1));
 	memset(c2, 0, sizeof(*c2));
 	memset(&p, 0, sizeof(p));
@@ -189,6 +182,7 @@ static bool test_channel_crud(void)
 	p.id = pk;
 	p.unique_id = 42;
 	p.our_msatoshi = NULL;
+	memset(&ci.their_config, 0, sizeof(struct channel_config));
 	ci.remote_fundingkey = pk;
 	ci.theirbase.revocation = pk;
 	ci.theirbase.payment = pk;
@@ -276,7 +270,7 @@ int main(void)
 
 	ok &= test_wallet_outputs();
 	ok &= test_shachain_crud();
-	ok &= test_channel_crud();
+	ok &= test_channel_crud(tmpctx);
 	ok &= test_channel_config_crud(tmpctx);
 
 	tal_free(tmpctx);