diff --git a/Makefile b/Makefile
index 5ca5d6cbd..3628bc734 100644
--- a/Makefile
+++ b/Makefile
@@ -619,7 +619,13 @@ clean: obsclean
 	find . -name '*gcno' -delete
 	find . -name '*.nccout' -delete
 
+# These must both be enabled for update-mocks
+ifeq ($(DEVELOPER)$(EXPERIMENTAL_FEATURES),11)
 update-mocks: $(ALL_TEST_PROGRAMS:%=update-mocks/%.c)
+else
+update-mocks:
+	@echo Need DEVELOPER=1 and EXPERIMENTAL_FEATURES=1 to regenerate mocks >&2; exit 1
+endif
 
 $(ALL_TEST_PROGRAMS:%=update-mocks/%.c): $(ALL_GEN_HEADERS) $(EXTERNAL_LIBS) $(CCAN_OBJS) ccan/ccan/cdump/tools/cdump-enumstr config.vars