diff --git a/Makefile b/Makefile
index 8d92e6ad8..1ee5a6fd8 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 # bill@newbreedsoftware.com
 # http://www.newbreedsoftware.com/tuxpaint/
 
-# June 14, 2002 - May 16, 2004
+# June 14, 2002 - May 29, 2004
 
 
 # Where to install things:
@@ -202,11 +202,21 @@ uninstall:
 	fi
 	-rm $(ICON_PREFIX)tuxpaint.png
 	-rm $(X11_ICON_PREFIX)tuxpaint.xpm
+	-if [ "x$(KDE_ICON_PREFIX)" != "x" ]; then \
+	  rm $(KDE_ICON_PREFIX)/default.kde/scalable/apps/tuxpaint.svg; \
+	  rm $(KDE_ICON_PREFIX)/default.kde/128x128/apps/tuxpaint.png; \
+	  rm $(KDE_ICON_PREFIX)/default.kde/64x64/apps/tuxpaint.png; \
+	  rm $(KDE_ICON_PREFIX)/default.kde/48x48/apps/tuxpaint.png; \
+	  rm $(KDE_ICON_PREFIX)/default.kde/32x32/apps/tuxpaint.png; \
+	  rm $(KDE_ICON_PREFIX)/default.kde/16x16/apps/tuxpaint.png; \
+	fi
 	-rm $(BIN_PREFIX)/tuxpaint
 	-rm $(BIN_PREFIX)/tuxpaint-import
 	-rm -r $(DATA_PREFIX)
 	-rm -r $(DOC_PREFIX)
 	-rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+	-rm $(MAN_PREFIX)/pl/man1/tuxpaint.1.gz
+	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
 	-rm $(LOCALE_PREFIX)af/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)be/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)br/LC_MESSAGES/tuxpaint.mo
@@ -232,7 +242,7 @@ uninstall:
 	-rm $(LOCALE_PREFIX)lt/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)ms/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)nl/LC_MESSAGES/tuxpaint.mo
-	-rm $(LOCALE_PREFIX)nb/LC_LESSAGES/tuxpaint.mo
+	-rm $(LOCALE_PREFIX)nb/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)nn/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)pl/LC_MESSAGES/tuxpaint.mo
 	-rm $(LOCALE_PREFIX)pt/LC_MESSAGES/tuxpaint.mo
@@ -302,21 +312,24 @@ install-kde:
 install-kde-icons:
 	@echo "...Installing launcher icon graphics into KDE..."
 	@if [ "x$(KDE_ICON_PREFIX)" != "x" ]; then \
-	  install -d $(KDE_ICON_PREFIX)/hicolor/128x128/apps/; \
-	  install -d $(KDE_ICON_PREFIX)/hicolor/64x64/apps/; \
-	  install -d $(KDE_ICON_PREFIX)/hicolor/48x48/apps/; \
-	  install -d $(KDE_ICON_PREFIX)/hicolor/32x32/apps/; \
-	  install -d $(KDE_ICON_PREFIX)/hicolor/16x16/apps/; \
+	  install -d $(KDE_ICON_PREFIX)/default.kde/scalable/apps/; \
+	  install -d $(KDE_ICON_PREFIX)/default.kde/128x128/apps/; \
+	  install -d $(KDE_ICON_PREFIX)/default.kde/64x64/apps/; \
+	  install -d $(KDE_ICON_PREFIX)/default.kde/48x48/apps/; \
+	  install -d $(KDE_ICON_PREFIX)/default.kde/32x32/apps/; \
+	  install -d $(KDE_ICON_PREFIX)/default.kde/16x16/apps/; \
+	  cp data/images/tuxpaint-icon.svg \
+		$(KDE_ICON_PREFIX)/default.kde/scalable/apps/tuxpaint.svg; \
 	  cp data/images/icon128x128.png \
-		$(KDE_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
+		$(KDE_ICON_PREFIX)/default.kde/128x128/apps/tuxpaint.png; \
 	  cp data/images/icon64x64.png \
-		$(KDE_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
+		$(KDE_ICON_PREFIX)/default.kde/64x64/apps/tuxpaint.png; \
 	  cp data/images/icon48x48.png \
-		$(KDE_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
+		$(KDE_ICON_PREFIX)/default.kde/48x48/apps/tuxpaint.png; \
 	  cp data/images/icon32x32.png \
-		$(KDE_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
+		$(KDE_ICON_PREFIX)/default.kde/32x32/apps/tuxpaint.png; \
 	  cp data/images/icon16x16.png \
-		$(KDE_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
+		$(KDE_ICON_PREFIX)/default.kde/16x16/apps/tuxpaint.png; \
 	fi