diff --git a/CHANGES b/CHANGES
index b5ba5c563..3b48c60ba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Fandrich (1 Oct 2008)
+- "make clean" now cleans out the docs and tests directories, too.
+
 Daniel Stenberg (30 Sep 2008)
 - The libcurl FTP code now returns CURLE_REMOTE_FILE_NOT_FOUND error when SIZE
   gets a 550 response back for the cases where a download (or NOBODY) is
diff --git a/Makefile.am b/Makefile.am
index 5e3fcfdc3..38030152e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,10 @@ endif
 examples:
 	@(cd docs/examples; $(MAKE) check)
 
+clean-local:
+	@(cd tests; $(MAKE) clean)
+	@(cd docs; $(MAKE) clean)
+
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
 # must contain the following line:
@@ -105,7 +109,7 @@ rpm:
 	mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm .
 
 #
-# Build a Solaris pkkgadd format file
+# Build a Solaris pkgadd format file
 # run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format
 # file (which ends up back in this directory).
 # The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do