diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index e3cc52cd4..3d50447c2 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-10  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* Makefile.in: Remove files from lib directory with distclean target
+
 2006-09-10  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
 	* include/winuser.h (CS_DROPSHADOW): Define.
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index 71379dac3..9d8307ce9 100644
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -150,8 +150,10 @@ maintainer-clean-top:
 mostlyclean: mostlyclean-top mostlyclean-subdirs
 clean: mostlyclean-top clean-subdirs
 distclean: clean-top
-	rm -f Makefile config.status config.log config.cache TAGS *~
+	$(MAKE) -C lib/directx distclean
+	$(MAKE) -C lib/ddk distclean
 	$(MAKE) -C lib distclean
+	rm -f Makefile config.status config.log config.cache TAGS *~
 maintainer-clean: maintainer-clean-subdirs
 
 .PHONY: lib test