diff --git a/ChangeLog b/ChangeLog
index 3def91f3..8b084ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    Add VTE preference to skip the generated run script. when running
    commands in the VTE.
    Make vte_cwd() accept also paths not only filenames.
+ * geany.desktop.in.in: Avoid full path for icon entry.
+ * geany.spec.in: Add file HACKING and classviewer icons.
+ * Makefile.am: Prevent installing geany.desktop twice.
 
 
 2007-12-16  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/Makefile.am b/Makefile.am
index 6ab452ea..136b617f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,8 +93,6 @@ rpm: dist
 	rpmbuild -ta $(distdir).tar.gz
 
 
-Applicationsdir = $(datadir)/applications
-Applications_DATA = geany.desktop
 logodir = $(datadir)/pixmaps
 
 desktopdir = $(datadir)/applications
diff --git a/geany.desktop.in.in b/geany.desktop.in.in
index 37dcacda..d22a9fe5 100644
--- a/geany.desktop.in.in
+++ b/geany.desktop.in.in
@@ -5,7 +5,7 @@ _Name=Geany
 _GenericName=Integrated Development Environment
 _Comment=A fast and lightweight IDE using GTK2
 Exec=geany %F
-Icon=@GEANY_PIXMAPS_DIR@/geany.png
+Icon=geany
 Terminal=false
 Categories=GTK;Development;IDE;
 MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;
diff --git a/geany.spec.in b/geany.spec.in
index f2de69cb..4dd7d3a0 100644
--- a/geany.spec.in
+++ b/geany.spec.in
@@ -42,7 +42,7 @@ Some features:
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+%doc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO THANKS
 %{_bindir}/%{name}
 %{_libdir}/geany/
 %{_datadir}/%{name}
@@ -51,3 +51,4 @@ Some features:
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/doc/%{name}/
 %{_datadir}/man/man1/%{name}.1.gz
+%{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png