diff --git a/configure.ac b/configure.ac
index 81bcb0a8..7db226d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -911,6 +911,7 @@ Makefile
 share/Makefile
 share/icons/Makefile
 share/misc/Makefile
+share/sounds/Makefile
 src/Makefile
 src/common/Makefile
 src/common/dbus/Makefile
diff --git a/share/Makefile.am b/share/Makefile.am
index 6d143b61..8c31642a 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,3 +1,5 @@
 if DO_GTK
-SUBDIRS = icons misc
+SUBDIRS = icons sounds misc
+else
+SUBDIRS = sounds
 endif
diff --git a/share/sounds/Makefile.am b/share/sounds/Makefile.am
new file mode 100644
index 00000000..b71011c9
--- /dev/null
+++ b/share/sounds/Makefile.am
@@ -0,0 +1,11 @@
+sound_DATA = beep.wav
+sounddir = $(datadir)/sounds/freedesktop/stereo
+
+UPDATE_SOUND_CACHE = touch -m $(datadir)/sounds/freedesktop || :
+
+install-data-hook:
+	mv -f $(datadir)/sounds/freedesktop/stereo/beep.wav $(datadir)/sounds/freedesktop/stereo/hexchat_beep.wav
+	$(UPDATE_SOUND_CACHE);
+
+uninstall-hook:
+	$(UPDATE_SOUND_CACHE);