diff --git a/ChangeLog b/ChangeLog
index 60dde4835..2a68e1502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,11 @@
 
 	* Panels/GNUmakefile.postamble (after-uninstall): Fixed uninstall
 	target.
-
+	* Source/CompatibilityHeaders.make (after-install): Use
+	ECHO_NOTHING and END_ECHO.
+	(after-uninstall): New target that uninstalls the compatibility
+	headers.
+	
 2007-03-12  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSAffineTransform.m: Set _isIdentity for all methods
diff --git a/Source/CompatibilityHeaders.make b/Source/CompatibilityHeaders.make
index 6aef006e3..9ee17356a 100644
--- a/Source/CompatibilityHeaders.make
+++ b/Source/CompatibilityHeaders.make
@@ -30,20 +30,35 @@
 after-install::
 	@echo Installing compatibility headers...
 
-	@OLD_DIR=AppKit; NEW_DIR=GNUstepGUI; \
+	$(ECHO_NOTHING)OLD_DIR=AppKit; NEW_DIR=GNUstepGUI; \
 	LIST="$(GUI_HEADERS)" ;\
 	$(MKDIRS) $(GNUSTEP_HEADERS)/$$OLD_DIR; \
 	for I in $$LIST ; do \
 	  (echo "#warning $$I is now included using the path <$$NEW_DIR/$$I>";\
 	   echo "#include <$$NEW_DIR/$$I>" ) \
 	  > $(GNUSTEP_HEADERS)/$$OLD_DIR/$$I; \
-	done
+	done$(END_ECHO)
 
-	@OLD_DIR=gnustep/gui; NEW_DIR=GNUstepGUI; \
+	$(ECHO_NOTHING)OLD_DIR=gnustep/gui; NEW_DIR=GNUstepGUI; \
 	LIST="$(GUI_HEADERS)" ;\
 	$(MKDIRS) $(GNUSTEP_HEADERS)/$$OLD_DIR; \
 	for I in $$LIST ; do \
 	  (echo "#warning $$I is now included using the path <$$NEW_DIR/$$I>";\
 	   echo "#include <$$NEW_DIR/$$I>" ) \
 	  > $(GNUSTEP_HEADERS)/$$OLD_DIR/$$I; \
-	done
+	done$(END_ECHO)
+
+after-uninstall::
+	@echo Uninstalling compatibility headers...
+
+	$(ECHO_NOTHING)OLD_DIR=AppKit; \
+	LIST="$(GUI_HEADERS)" ;\
+	for I in $$LIST ; do \
+	   rm -f $(GNUSTEP_HEADERS)/$$OLD_DIR/$$I; \
+	done$(END_ECHO)
+
+	$(ECHO_NOTHING)OLD_DIR=gnustep/gui; \
+	LIST="$(GUI_HEADERS)" ;\
+	for I in $$LIST ; do \
+	   rm -f $(GNUSTEP_HEADERS)/$$OLD_DIR/$$I; \
+	done$(END_ECHO)