diff --git a/Makefile.am b/Makefile.am
index 40ed64e9..91ca9d79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po intl src plugins man
+SUBDIRS = po intl src plugins man share
 
 EXTRA_DIST = autogen.sh
 
-icon_DATA = src/pixmaps/hexchat.png
-icondir = $(datadir)/pixmaps
-
-util_DATA = share/misc/hexchat.desktop
-utildir = $(datadir)/applications
-
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 66f698d3..5e129180 100644
--- a/configure.ac
+++ b/configure.ac
@@ -950,6 +950,9 @@ AC_SUBST(hexchatlibdir)
 
 AC_OUTPUT([
 Makefile
+share/Makefile
+share/icons/Makefile
+share/misc/Makefile
 src/Makefile
 src/common/Makefile
 src/common/dbus/Makefile
diff --git a/share/Makefile.am b/share/Makefile.am
new file mode 100644
index 00000000..f265b88e
--- /dev/null
+++ b/share/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = icons misc
diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am
new file mode 100644
index 00000000..dadaa67d
--- /dev/null
+++ b/share/icons/Makefile.am
@@ -0,0 +1,13 @@
+icon_DATA = ../../src/pixmaps/hexchat.png
+icondir = $(datadir)/pixmaps
+
+hicolor_DATA = hexchat.svg
+hicolordir = $(datadir)/icons/hicolor/scalable/apps
+
+UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	$(UPDATE_ICON_CACHE);
+
+uninstall-hook:
+	$(UPDATE_ICON_CACHE);
diff --git a/share/misc/Makefile.am b/share/misc/Makefile.am
new file mode 100644
index 00000000..eec37250
--- /dev/null
+++ b/share/misc/Makefile.am
@@ -0,0 +1,3 @@
+util_DATA = hexchat.desktop
+utildir = $(datadir)/applications
+