diff --git a/Makefile.am b/Makefile.am
index 3f505e28..d8b5d3a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = katze src po
+SUBDIRS = katze src po data
 
 desktopdir = $(datadir)/applications
 desktop_in_files = midori.desktop
diff --git a/configure.in b/configure.in
index c21df45a..784509be 100644
--- a/configure.in
+++ b/configure.in
@@ -102,7 +102,8 @@ AC_CONFIG_FILES([
     Makefile       \
     katze/Makefile \
     src/Makefile   \
-    po/Makefile.in
+    po/Makefile.in \
+    data/Makefile
 ])
 AC_OUTPUT
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..6341bfc8
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,17 @@
+iconsdir = $(datadir)/icons/hicolor/scalable/apps
+icons_DATA = midori.svg
+
+EXTRA_DIST = $(icons_DATA)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi