diff --git a/ChangeLog b/ChangeLog
index 13c5772c8..e3561feef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-18  Roland Illig  <roland.illig@gmx.de>
+
+	* "make uninstall" removes the symlinks bin/mcedit and bin/mcview.
+
 2004-08-17  Roland Illig  <roland.illig@gmx.de>
 
 	* configure.ac: The GCC warning flags are only used in
diff --git a/src/Makefile.am b/src/Makefile.am
index 77a8c01d1..3747b780e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,3 +83,9 @@ install_mcview:
 
 install_mcedit:
 	cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcedit && $(LN_S) mc mcedit
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(bindir)/$(binprefix)/mcview
+if USE_EDIT
+	rm -f $(DESTDIR)$(bindir)/$(binprefix)/mcedit
+endif