diff --git a/ChangeLog b/ChangeLog
index 95e0e840b..e828b0318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-23  Rachel Hestilow  <hestilow@ximian.com>
+
+	* Applied patch from Robot101 for maintainer-clean, etc.
+	Needed for packaging.
+
 2002-08-20  Rachel Hestilow  <hestilow@ximian.com>
 
 	* generator/SymbolTable.cs (Trim): Work around "void*".
diff --git a/api/Makefile.in b/api/Makefile.in
index 06faa1e25..f00e86037 100644
--- a/api/Makefile.in
+++ b/api/Makefile.in
@@ -15,13 +15,14 @@ all: generated-stamp
 
 generated-stamp: $(APIS) ../generator/gapi_codegen.exe
 	$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) && touch generated-stamp
-	
+
 clean:
+	rm -f generated-stamp
 
 prefix=@prefix@
-apidir = $(DESTDIR)$(prefix)/share/gapi
+DESTDIR=
+apidir=$(DESTDIR)$(prefix)/share/gapi
 
 install: all
-	../mkinstalldirs $(apidir)
+	../mkinstalldirs $(apidir) && \
 	cp $(APIS) $(apidir)
-
diff --git a/art/Makefile.in b/art/Makefile.in
index af388a743..8cc7b7ee0 100755
--- a/art/Makefile.in
+++ b/art/Makefile.in
@@ -13,7 +13,7 @@ art-sharp.dll: generated/*.cs
 
 clean:
 	rm -f *.dll
-	rm -f generated/*.cs
+	rm -rf generated
 
 install: all
 	cp art-sharp.dll $(DESTDIR)@prefix@/lib
diff --git a/atk/Makefile.in b/atk/Makefile.in
index d1321cae5..469a88a29 100644
--- a/atk/Makefile.in
+++ b/atk/Makefile.in
@@ -13,7 +13,7 @@ atk-sharp.dll: generated/*.cs
 
 clean:
 	rm -f *.dll
-	rm -f generated/*
+	rm -rf generated
 
 install: all
 	cp atk-sharp.dll $(DESTDIR)@prefix@/lib
diff --git a/gdk/Makefile.in b/gdk/Makefile.in
index 3d136633b..9c4e88ec7 100755
--- a/gdk/Makefile.in
+++ b/gdk/Makefile.in
@@ -13,7 +13,7 @@ gdk-sharp.dll: *.cs generated/*.cs
 
 clean:
 	rm -f *.dll
-	rm -f generated/*
+	rm -rf generated
 
 install: all
 	cp gdk-sharp.dll $(DESTDIR)@prefix@/lib
diff --git a/generator/Makefile.in b/generator/Makefile.in
index 9f5756f42..b2e50f359 100644
--- a/generator/Makefile.in
+++ b/generator/Makefile.in
@@ -1,5 +1,6 @@
 MCS=mcs
 RUNTIME=mono
+DESTDIR=
 
 all: linux
 
@@ -15,6 +16,7 @@ clean:
 prefix=@prefix@
 
 install: all
+	../mkinstalldirs $(DESTDIR)$(prefix)/bin && \
 	cp gapi_codegen.exe $(DESTDIR)$(prefix)/bin
 
 gapi_codegen.exe: *.cs
diff --git a/glade/Makefile.in b/glade/Makefile.in
index cef5684d5..73e87d6bd 100755
--- a/glade/Makefile.in
+++ b/glade/Makefile.in
@@ -14,8 +14,7 @@ glade-sharp.dll: generated/*.cs
 
 clean:
 	rm -f *.dll
-	rm -f generated/*
+	rm -rf generated
 
 install: all
 @ENABLE_GLADE_TRUE@	cp glade-sharp.dll $(DESTDIR)@prefix@/lib
-
diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index 4a76baca0..baa798053 100755
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -14,7 +14,7 @@ gnome-sharp.dll: generated/*.cs
 
 clean:
 	rm -f *.dll
-	rm -f generated/*.cs
+	rm -rf generated
 
 install: all
 @ENABLE_GNOME_TRUE@	cp gnome-sharp.dll $(DESTDIR)@prefix@/lib
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 24083da26..a67f0bb29 100755
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -13,7 +13,7 @@ gtk-sharp.dll: *.cs generated/*.cs
 
 clean:
 	rm -f *.dll
-	rm -f generated/*
+	rm -rf generated
 
 install: all
 	cp gtk-sharp.dll $(DESTDIR)@prefix@/lib
diff --git a/makefile b/makefile
index 009c5e21e..4d057e91f 100644
--- a/makefile
+++ b/makefile
@@ -8,8 +8,8 @@ MCS=mcs
 all: linux
 
 windows:
-	for i in $(DIRS); do				\
-		(cd $$i; CSC=$(CSC) make windows) || exit 1;\
+	for i in $(DIRS); do					\
+		CSC=$(CSC) make -C $$i windows || exit 1;	\
 	done;
 
 unix:
@@ -19,37 +19,41 @@ linux: native binding
 
 binding:
 	for i in $(DIRS); do				\
-		(cd $$i; MCS="$(MCS)" make) || exit 1;\
+		MCS="$(MCS)" make -C $$i || exit 1;\
 	done;
 
 native:
-	for i in $(NATIVE_DIRS); do \
-		(cd $$i; make) || exit 1;\
+	for i in $(NATIVE_DIRS); do			\
+		make -C $$i || exit 1;			\
 	done
 
 clean:
-	for i in $(NATIVE_DIRS) $(DIRS); do	\
-		(cd $$i; make clean) || exit 1;	\
+	for i in $(NATIVE_DIRS) $(DIRS); do		\
+		make -C $$i clean || exit 1;		\
 	done;
 
 distclean: clean
-	for i in $(NATIVE_DIRS); do \
-		(cd $$i; make distclean) || exit 1;\
+	for i in $(NATIVE_DIRS); do			\
+		make -C $$i distclean || exit 1;	\
 	done
 	for i in $(DIRS); do				\
 		rm -f $$i/Makefile;			\
 	done
 	rm -f config.cache config.h config.log config.status libtool
 
+maintainer-clean: distclean
+	rm -f aclocal.m4 config.guess config.h.in config.sub
+	rm -f configure install-sh ltmain.sh missing
+	rm -f mkinstalldirs stamp-h glue/Makefile.in
+
 install: install-native install-binding
 
 install-binding:
 	for i in $(DIRS); do				\
-		(cd $$i; make install) || exit 1;	\
-	done;
-
-install-native:
-	for i in $(NATIVE_DIRS); do \
-		(cd $$i; make install) || exit 1;\
+		make -C $$i install || exit 1;		\
 	done
 
+install-native:
+	for i in $(NATIVE_DIRS); do			\
+		make -C $$i install || exit 1;		\
+	done
diff --git a/pango/Makefile.in b/pango/Makefile.in
index f903412ef..2ccbda139 100644
--- a/pango/Makefile.in
+++ b/pango/Makefile.in
@@ -13,7 +13,7 @@ pango-sharp.dll: generated/*.cs
 
 clean:
 	rm -f *.dll
-	rm -f generated/*
+	rm -rf generated
 
 install: all
 	cp pango-sharp.dll $(DESTDIR)@prefix@/lib
diff --git a/parser/Makefile.in b/parser/Makefile.in
index 234d5e6aa..3ab1fb265 100644
--- a/parser/Makefile.in
+++ b/parser/Makefile.in
@@ -14,16 +14,17 @@ clean:
 	rm -f gapi_format_xml
 
 distclean:
-	rm -f gapi_format_xml
+	rm -f Makefile gapi_format_xml
 
 prefix=@prefix@
+DESTDIR=
 
 install: all
 	for i in $(SCRIPTS) gapi_format_xml; do \
+		../mkinstalldirs $(DESTDIR)$(prefix)/bin && \
 		cp $$i $(DESTDIR)$(prefix)/bin; \
 	done
 	for i in $(MODULES); do \
 		../mkinstalldirs $(DESTDIR)$(prefix)/share/perl5/GAPI && \
 		cp $$i $(DESTDIR)$(prefix)/share/perl5/GAPI; \
 	done
-