diff --git a/ChangeLog b/ChangeLog
index 31f7d9aff..56c965c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-29  Jens Granseuer  <jensgr@gmx.net>
+
+	* capplets/Makefile.am:
+	* configure.in: fix build without libcanberra
+
 2008-07-29  Bastien Nocera  <hadess@hadess.net>
 
 	* configure.in: Make sure we require libcanberra 0.4
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index cf56dd13f..ec0c4728d 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -19,7 +19,7 @@ if BUILD_ABOUTME
 SUBDIRS += about-me
 endif
 
-if HAVE_GSTREAMER
+if BUILD_SOUND
 SUBDIRS += sound
 endif
 
diff --git a/configure.in b/configure.in
index ae344ec99..e54a77d60 100644
--- a/configure.in
+++ b/configure.in
@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
 PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
-PKG_CHECK_MODULES(LIBSOUNDS, gio-2.0 libgnome-2.0 libgnomeui-2.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 PKG_CHECK_MODULES(GIO, gio-2.0)
 
@@ -293,6 +292,7 @@ if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then
 else
   AC_MSG_NOTICE([*** Sound capplet will not be built]);
 fi
+AM_CONDITIONAL(BUILD_SOUND, test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes")
 
 dnl ==============================================
 dnl Define the main variables