diff --git a/ChangeLog b/ChangeLog
index fd99e8ff7..3f05fd3aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-15  Jens Granseuer  <jensgr@gmx.net>
+
+	* capplets/Makefile.am:
+	* configure.in: don't fail if gstreamer is not available, but simply
+	skip the sound capplet (closes bug #456957)
+
 2007-07-09  Rodrigo Moya <rodrigo@gnome-db.org>
 
 	* configure.in:
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index f687f7778..cf56dd13f 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -1,12 +1,11 @@
-always_built_SUBDIRS =		\
+always_built_SUBDIRS = \
 	common			\
-	accessibility		\
+	accessibility	\
 	appearance		\
 	default-applications	\
+	keybindings		\
 	keyboard		\
 	mouse			\
-	sound			\
-	keybindings		\
 	network			\
 	windows
 
@@ -20,5 +19,9 @@ if BUILD_ABOUTME
 SUBDIRS += about-me
 endif
 
+if HAVE_GSTREAMER
+SUBDIRS += sound
+endif
+
 DIST_SUBDIRS = \
-	$(always_built_SUBDIRS) display about-me
+	$(always_built_SUBDIRS) display about-me sound
diff --git a/configure.in b/configure.in
index 95e150167..2b769c847 100644
--- a/configure.in
+++ b/configure.in
@@ -108,9 +108,6 @@ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
 PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0)
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
-PKG_CHECK_MODULES(SOUND_CAPPLET, esound gstreamer-0.10 gstreamer-plugins-base-0.10)
-SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
-AC_SUBST(SOUND_CAPPLET_LIBS)
 PKG_CHECK_MODULES(METACITY, libmetacity-private)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.13 gconf-2.0 gtk+-2.0)
 
@@ -126,8 +123,8 @@ fi
 
 dnl
 dnl Check for XInput, needed for gnome-settings-daemon mouse settings
-dnl		
-	
+dnl
+
 have_xinput=no
 AC_CHECK_LIB(Xi, XListInputDevices,
   [AC_CHECK_HEADER(X11/extensions/XInput.h,
@@ -145,7 +142,7 @@ PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES)
 
 dnl
 dnl Check for XRandR, needed for display capplet
-dnl		
+dnl
 
 have_randr=no
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
@@ -165,8 +162,6 @@ CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"
 GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"
 GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS $x_libs"
 
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-
 dnl
 dnl Check for XCursor support.  If it exists, then we compile the
 dnl mouse capplet with support for it turned on
@@ -204,7 +199,7 @@ AC_ARG_ENABLE(vfs-methods,
                  [do not build the fonts:/// and themes:/// uri schemes]),,
   enable_vfs_methods=yes)
 
-if test x$enable_vfs_methods = xyes; then 
+if test x$enable_vfs_methods = xyes; then
 
   PKG_CHECK_MODULES(THEME_METHOD,
   [gnome-vfs-module-2.0 >= 2.2.0 dnl
@@ -307,8 +302,8 @@ if test x"$GDK_PIXBUF_CSOURCE" = xno; then
   else
     GDK_PIXBUF_CSOURCE=$GDK_PIXBUF_CSOURCE_32
   fi
-fi 
-  
+fi
+
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
@@ -320,7 +315,7 @@ fi
 AC_SUBST(GLIB_GENMARSHAL)
 
 dnl ==============================================
-dnl Special GConf section 
+dnl Special GConf section
 dnl ==============================================
 
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
@@ -432,10 +427,18 @@ if test "x$ENABLE_GSTREAMER" = "xyes"; then
 else
    AC_MSG_NOTICE([*** GStreamer support disabled ***])
 fi
-AM_CONDITIONAL(HAVE_GSTREAMER, test x"$have_gstreamer" = "xyes")
+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
 
+if test "x$have_gstreamer" = "xyes"; then
+  PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
+  SOUND_CAPPLET_LIBS="$GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
+  AC_SUBST(SOUND_CAPPLET_LIBS)
+else
+  AC_MSG_NOTICE([*** Sound capplet will not be built]);
+fi
+
 dnl ==============================================
 dnl Define the main variables
 dnl ==============================================