diff --git a/common/autodata.c b/common/autodata.c
index 4273a9b0b..ddeab76fd 100644
--- a/common/autodata.c
+++ b/common/autodata.c
@@ -38,3 +38,17 @@ void *autodata_get_(const char *typename, size_t *nump)
 	*nump = t->num;
 	return t->ptrs;
 }
+
+static bool free_one(const char *member,
+		     struct typereg *t, void *unused)
+{
+	free(t->ptrs);
+	free(t);
+	return true;
+}
+
+void autodata_cleanup(void)
+{
+	strmap_iterate(&typemap, free_one, NULL);
+	strmap_clear(&typemap);
+}
diff --git a/common/autodata.h b/common/autodata.h
index 7d05217b4..60c300bab 100644
--- a/common/autodata.h
+++ b/common/autodata.h
@@ -3,6 +3,7 @@
 #include "config.h"
 #include <ccan/compiler/compiler.h>
 #include <ccan/cppmagic/cppmagic.h>
+#include <stddef.h>
 
 #define AUTODATA_TYPE(name, type)					\
 	static inline void register_autotype_##name(const type *t) {	\
@@ -23,4 +24,6 @@
 void autodata_register_(const char *typename, const void *ptr);
 void *autodata_get_(const char *typename, size_t *nump);
 
+/* Call on shutdown to keep valgrind leak detection happy. */
+void autodata_cleanup(void);
 #endif /* LIGHTNING_COMMON_AUTODATA_H */
diff --git a/common/setup.c b/common/setup.c
index 6f4c4182a..46879e6e1 100644
--- a/common/setup.c
+++ b/common/setup.c
@@ -1,6 +1,7 @@
 #include "config.h"
 #include <assert.h>
 #include <ccan/ccan/err/err.h>
+#include <common/autodata.h>
 #include <common/setup.h>
 #include <common/utils.h>
 #include <sodium.h>
@@ -58,4 +59,5 @@ void common_shutdown(void)
 	tal_free(tmpctx);
 	wally_cleanup(0);
 	tal_free(wally_tal_ctx);
+	autodata_cleanup();
 }
diff --git a/connectd/Makefile b/connectd/Makefile
index 8d30894c8..8e17d4c17 100644
--- a/connectd/Makefile
+++ b/connectd/Makefile
@@ -76,6 +76,6 @@ CONNECTD_COMMON_OBJS :=				\
 
 lightningd/lightning_connectd: $(CONNECTD_OBJS) $(CONNECTD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS)
 
-lightningd/lightning_websocketd: $(WEBSOCKETD_OBJS) common/setup.o common/utils.o
+lightningd/lightning_websocketd: $(WEBSOCKETD_OBJS) common/setup.o common/utils.o common/autodata.o
 
 include connectd/test/Makefile
diff --git a/tests/plugins/Makefile b/tests/plugins/Makefile
index 94ba95762..3f2e6e3aa 100644
--- a/tests/plugins/Makefile
+++ b/tests/plugins/Makefile
@@ -8,7 +8,7 @@ $(PLUGIN_TESTLIBPLUGIN_OBJS): $(PLUGIN_LIB_HEADER)
 PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_SRC := tests/plugins/test_selfdisable_after_getmanifest.c 
 PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_OBJS := $(PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_SRC:.c=.o)
 
-tests/plugins/test_selfdisable_after_getmanifest: bitcoin/chainparams.o $(PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_OBJS) common/json.o common/json_stream.o common/setup.o common/utils.o $(JSMN_OBJS) $(CCAN_OBJS)
+tests/plugins/test_selfdisable_after_getmanifest: bitcoin/chainparams.o $(PLUGIN_TESTSELFDISABLE_AFTER_GETMANIFEST_OBJS) common/autodata.o common/json.o common/json_stream.o common/setup.o common/utils.o $(JSMN_OBJS) $(CCAN_OBJS)
 
 # Make sure these depend on everything.
 ALL_TEST_PROGRAMS += tests/plugins/test_libplugin tests/plugins/test_selfdisable_after_getmanifest