diff --git a/Makefile.local b/Makefile.local
index 07e92964..3377d55e 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -262,6 +262,10 @@ clean:
 distclean: clean
 	rm -rf $(DISTCLEAN)
 
+.PHONY: dataclean
+dataclean: distclean
+	rm -rf $(DATACLEAN)
+
 notmuch_client_srcs =		\
 	command-line-arguments.c\
 	debugger.c		\
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index cbea2d36..3469aa3d 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -41,3 +41,4 @@ download-corpus:
 
 CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.*
 DISTCLEAN := $(DISTCLEAN) $(dir)/corpus $(dir)/notmuch.cache.*
+DATACLEAN := $(DATACLEAN) $(TXZFILE)
diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local
index 0572e784..ff333a1d 100644
--- a/test/test-databases/Makefile.local
+++ b/test/test-databases/Makefile.local
@@ -11,4 +11,4 @@ test_databases := $(dir)/database-v1.tar.xz
 
 download-test-databases: ${test_databases}
 
-DISTCLEAN := $(DISTCLEAN) ${test_databases}
+DATACLEAN := $(DATACLEAN) ${test_databases}