diff --git a/libcanberra-gtk-module.sh b/libcanberra-gtk-module.sh
new file mode 100755
index 0000000..fbb7ff7
--- /dev/null
+++ b/libcanberra-gtk-module.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -z "$GTK_MODULES" ] ; then
+	GTK_MODULES="canberra-gtk-module"
+else
+	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+fi
+
+export GTK_MODULES
+
diff --git a/libcanberra.spec b/libcanberra.spec
index ab0bb28..331bf72 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/public/libcanberra-%{version}.tar.gz
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Jul 30 2008 Lennart Poettering <lpoetter@redhat.com> 0.5-3
+- Ship libcanberra-gtk-module.sh directly in CVS
+
 * Wed Jul 30 2008 Lennart Poettering <lpoetter@redhat.com> 0.5-2
 - Fix build