diff --git a/Makefile b/Makefile
index 1b8d133cb..fddfcb460 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 # bill@newbreedsoftware.com
 # http://www.newbreedsoftware.com/tuxpaint/
 
-# June 14, 2002 - Sept. 12, 2005
+# June 14, 2002 - Sept. 17, 2005
 
 
 # Where to install things:
@@ -39,7 +39,7 @@ MAN_PREFIX=$(PKG_ROOT)$(PREFIX)/share/man
 # 'System-wide' Config file:
 
 ifeq ($(PREFIX),/usr)
-  CONFDIR=$(PKG_ROOT)etc/tuxpaint
+  CONFDIR=$(PKG_ROOT)/etc/tuxpaint
 else
   CONFDIR=$(PKG_ROOT)$(PREFIX)/etc/tuxpaint
 endif
@@ -447,8 +447,6 @@ install-gnome:
 	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \
 	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
 	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
-	else \
-	 make install-gnome GNOME_PREFIX=$(PREFIX); \
 	fi
 
 
@@ -461,8 +459,6 @@ install-kde:
 	  install -d $(PKG_ROOT)$(KDE_PREFIX)/Graphics; \
 	  cp src/tuxpaint.desktop $(PKG_ROOT)$(KDE_PREFIX)/Graphics/; \
 	  chmod 644 $(PKG_ROOT)$(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
-	else \
-	  make KDE_PREFIX=$(PREFIX)/share/applnk install-kde; \
 	fi
 
 
diff --git a/tuxpaint.spec b/tuxpaint.spec
index 4116143a8..b34040c8a 100644
--- a/tuxpaint.spec
+++ b/tuxpaint.spec
@@ -35,12 +35,22 @@ make PREFIX=/usr
 rm -rf $RPM_BUILD_ROOT
 make PREFIX=/usr PKG_ROOT=$RPM_BUILD_ROOT install
 
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/tuxpaint
+find $RPM_BUILD_ROOT -name tuxpaint.desktop | sort | \
+    sed -e "s@$RPM_BUILD_ROOT@@g" > filelist.icons
+find $RPM_BUILD_ROOT -name tuxpaint.png | sort | \
+    sed -e "s@$RPM_BUILD_ROOT@@g" >> filelist.icons
+find $RPM_BUILD_ROOT -name tuxpaint.svg | sort | \
+    sed -e "s@$RPM_BUILD_ROOT@@g" >> filelist.icons
+find $RPM_BUILD_ROOT -name tuxpaint.xpm | sort | \
+    sed -e "s@$RPM_BUILD_ROOT@@g" >> filelist.icons
+
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/tuxpaint
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f filelist.icons
 %defattr(-,root,root,-)
 %doc docs/*
 
@@ -52,19 +62,16 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/*
 /usr/share/man/*/man1/tuxpaint.1.gz
 
-%config(noreplace) %{_sysconfdir}/tuxpaint/tuxpaint.conf
+%config(noreplace) /etc/tuxpaint/tuxpaint.conf
+
 
 %defattr(-, root, root)
 /usr/share/tuxpaint/*
 
-%defattr(-, root, root)
-/usr/share/pixmaps/tuxpaint.png
-/usr/X11R6/include/X11/pixmaps/tuxpaint.xpm
-
-/usr/share/applnk/Graphics/tuxpaint.desktop
-/usr/share/gnome/apps/Graphics/tuxpaint.desktop
-
 %changelog
+* Thu Sep 15 2005  <shin1@wmail.plala.or.jp> -
+- Do not force install desktop icons when Gnome and/or KDE are not installed.
+
 * Sun Mar 27 2005  <shin1@wmail.plala.or.jp> -
 - Some hicolor icons not installed were removed from file list