diff --git a/Makefile b/Makefile
index 4640cbb..4689961 100644
--- a/Makefile
+++ b/Makefile
@@ -29,3 +29,7 @@ BUILD_SUPPORT=$(CURDIR)/build-support
 
 include $(BUILD_SUPPORT)/core-build.mkf
 include $(BUILD_SUPPORT)/doc.mkf
+
+clean: jxa-clean doc-clean
+
+distclean: jxa-distclean doc-distclean
diff --git a/build-support/core-build.mkf b/build-support/core-build.mkf
index 6c2cc58..ec390d9 100644
--- a/build-support/core-build.mkf
+++ b/build-support/core-build.mkf
@@ -83,14 +83,14 @@ get-deps:
 shell: build $(TESTBEAMS)
 	$(ERL) $(ERLFLAGS) -s joxa main -s init stop
 
-clean:
+jxa-clean:
 	$(REBAR) skip_deps=true clean
 	rm -rf $(APPDIR)/joxa
 	rm -rf $(APPDIR)/.bootstrap
 	rm -rf $(APPDIR)/_build
 	rm -rf $(APPDIR)/erl_crash.dump
 
-distclean: clean
+jxa-distclean: jxa-clean
 	rm -rf $(APPDIR)/deps
 
 test: build proper eunit cucumber
diff --git a/build-support/doc.mkf b/build-support/doc.mkf
index b32545e..703c295 100644
--- a/build-support/doc.mkf
+++ b/build-support/doc.mkf
@@ -30,7 +30,7 @@ help:
 	@echo "  devhelp    to make HTML files and a Devhelp project"
 	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdf   tno make LaTeX files and run them through pdflatex"
 	@echo "  text       to make text files"
 	@echo "  man    to make manual pages"
 	@echo "  texinfo    to make Texinfo files"
@@ -116,3 +116,13 @@ linkcheck:
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in $(DOCBUILDDIR)/linkcheck/output.txt."
 
+doc-clean:
+	rm -rf $(DOCBUILDDIR)/_site
+	rm -rf $(DOCBUILDDIR)/html
+	rm -rf $(DOCBUILDDIR)/latex
+	rm -rf $(DOCBUILDDIR)/man
+	rm -rf $(DOCBUILDDIR)/texinfo
+	rm -rf $(DOCBUILDDIR)/text
+	rm -rf $(DOCBUILDDIR)/doctrees
+
+doc-distclean: doc-clean