--- a/Makefile	Thu Jan 12 22:55:46 2012 +0200
+++ b/Makefile	Thu Jan 12 23:01:02 2012 +0200
@@ -105,11 +105,14 @@
 .PHONY: dist
 dist: dist-dictd dist-src
 
+DIST_TARBALLS = $(DIST_DIR).tar.gz $(DIST_DIR).tar.bz2
+DISTSRC_TARBALLS = $(DISTSRC_DIR).tar.gz $(DISTSRC_DIR).tar.bz2
+
 .PHONY: dist-dictd
-dist-dictd: $(DIST_DIR).tar.gz $(DIST_DIR).tar.bz2
+dist-dictd: $(DIST_TARBALLS)
 
 .PHONY: dist-src
-dist-src: $(DISTSRC_DIR).tar.gz $(DISTSRC_DIR).tar.bz2
+dist-src: $(DISTSRC_TARBALLS)
 
 %.tar.gz: %
 	tar zcf $*.tar.gz $*
@@ -191,10 +194,12 @@
 
 .PHONY: distclean
 distclean: clean
+	rm -f VERSION
 
 .PHONY: clean
 clean:
 	rm -f $(DICTDZ_FILES) $(INDEX_FILES) $(HTML_FILES)
+	rm -rf $(DIST_DIR) $(DISTSRC_DIR) $(DIST_TARBALLS) $(DISTSRC_TARBALLS)
 
 ################################################################
 # Helper target.