diff --git a/Makefile b/Makefile
index bfe4523..a1ccee7 100644
--- a/Makefile
+++ b/Makefile
@@ -35,18 +35,15 @@ clean:
 	-find . -name '*.pygc' -exec rm -f {} \;
 	-find . -name '*.class' -exec rm -f {} \;
 	-find . -name '.cache*' -exec rm -f {} \;
-	# Care with that. We have html in subdirs we want to keep.
-	-find ./docs -name '*.html' -exec rm -f {} \;
 	-rm -f manpage.links manpage.refs
 	-find . -name auth -exec rm -vf {}/password {}/username \;
-	@$(MAKE) -C docs clean
+	@$(MAKE) -C clean
 
 man:
-	@$(MAKE) -C docs man
+	@$(MAKE) -C man
 
 doc:
 	@$(MAKE) -C docs
-	$(RST2HTML) Changelog.rst Changelog.html
 
 targz: ../$(TARGZ)
 ../$(TARGZ):
diff --git a/docs/Makefile b/docs/Makefile
index ec6aaaa..1311bbf 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -32,7 +32,9 @@ websitedoc:
 
 clean:
 	$(RM) -f $(HTML_TARGETS)
-	$(RM) -f offlineimap.1 ../offlineimap.1
+	$(RM) -f offlineimap.1
+	$(RM) -f offlineimap.7
 	$(RM) -rf html/*
+	-find ./docs -name '*.html' -exec rm -f {} \;
 
 .PHONY: clean doc