diff -urNp xchat-2.8.8.orig/configure.in xchat-2.8.8/configure.in
--- xchat-2.8.8.orig/configure.in	2013-06-07 17:33:41.600172433 +0200
+++ xchat-2.8.8/configure.in	2013-06-07 17:39:02.672190284 +0200
@@ -792,6 +792,7 @@ plugins/python/Makefile
 plugins/perl/Makefile
 plugins/tcl/Makefile
 intl/Makefile
+icons/Makefile
 po/Makefile.in
 ])
 
diff -urNp xchat-2.8.8.orig/icons/Makefile.am xchat-2.8.8/icons/Makefile.am
--- xchat-2.8.8.orig/icons/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ xchat-2.8.8/icons/Makefile.am	2013-06-07 17:35:09.053456817 +0200
@@ -0,0 +1,59 @@
+public_icon_themes = \
+	hicolor	\
+	$(NULL)
+
+public_icons = \
+	hicolor_apps_16x16_xchat.png \
+	hicolor_apps_22x22_xchat.png \
+	hicolor_apps_24x24_xchat.png \
+	hicolor_apps_32x32_xchat.png \
+	hicolor_apps_48x48_xchat.png \
+	hicolor_apps_256x256_xchat.png \
+	$(NULL)
+
+noinst_DATA = \
+	xchat.svg \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(public_icons) \
+	$(noinst_DATA) \
+	$(NULL)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		for theme in $(public_icon_themes); do \
+			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+		done; \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		for theme in $(public_icon_themes); do \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+		done; \
+	fi
+
+install-icons:
+	for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+uninstall-icons:
+	-for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache
diff -urNp xchat-2.8.8.orig/Makefile.am xchat-2.8.8/Makefile.am
--- xchat-2.8.8.orig/Makefile.am	2013-06-07 17:33:41.600172433 +0200
+++ xchat-2.8.8/Makefile.am	2013-06-10 13:25:06.316773350 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po intl src plugins
+SUBDIRS = po icons intl src plugins
 
 EXTRA_DIST = autogen.sh HACKING INSTALL.w32 faq.html xchat.png \
 		xchat.desktop xchat.spec config.h.w32 xchat.ico