diff --git a/backends/gstreamer/rb-encoder-gst.c b/backends/gstreamer/rb-encoder-gst.c
index 7c49878..e1b82a6 100644
--- a/backends/gstreamer/rb-encoder-gst.c
+++ b/backends/gstreamer/rb-encoder-gst.c
@@ -35,7 +35,13 @@
 #include <gst/gst.h>
 #include <gst/tag/tag.h>
 #include <string.h>
+
+#if defined(HAVE_LIBGNOME_MEDIA_PROFILES)
+#include <libgnome-media-profiles/gnome-media-profiles.h>
+#else
 #include <profiles/gnome-media-profiles.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <gst/pbutils/missing-plugins.h>
diff --git a/configure.ac b/configure.ac
index 7737ea6..a4f634f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,10 +91,20 @@ PKG_CHECK_MODULES(RHYTHMBOX,				\
 		  glib-2.0 >= $GLIB_REQS		\
 		  gio-2.0 >= $GLIB_REQS			\
 		  gio-unix-2.0 >= $GLIB_REQS		\
-		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
 		  libsoup-2.4 >= $LIBSOUP_REQS		\
 		  libsoup-gnome-2.4 >= $LIBSOUP_REQS)
 
+dnl check for gnome-media-profiles or libgnome-media-profiles-3.0
+PKG_CHECK_MODULES(GNOME_MEDIA_PROFILES,
+	gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS,
+	have_gnome_media_profiles=yes, have_gnome_media_profiles=no)
+if test "x$have_gnome_media_profiles" != "xyes"; then
+	PKG_CHECK_MODULES(GNOME_MEDIA_PROFILES, libgnome-media-profiles-3.0 >= GNOME_MEDIA_PROFILES_REQS)
+	AC_DEFINE(HAVE_LIBGNOME_MEDIA_PROFILES,1,[Define if you have libgnome-media-profiles installed])
+fi
+RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GNOME_MEDIA_PROFILES_LIBS"
+RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GNOME_MEDIA_PROFILES_CFLAGS"
+
 PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)
 if test x$have_totem_plparser != xyes; then
    AC_MSG_ERROR([totem playlist parsing library not found or too old])
diff --git a/sources/rb-library-source.c b/sources/rb-library-source.c
index 9238907..e77dfb1 100644
--- a/sources/rb-library-source.c
+++ b/sources/rb-library-source.c
@@ -54,8 +54,14 @@
 
 #include "rb-track-transfer-batch.h"
 #include "rb-track-transfer-queue.h"
+
+#if defined(HAVE_LIBGNOME_MEDIA_PROFILES)
+#include <libgnome-media-profiles/gnome-media-profiles.h>
+#include <libgnome-media-profiles/audio-profile-choose.h>
+#else
 #include <profiles/gnome-media-profiles.h>
 #include <profiles/audio-profile-choose.h>
+#endif
 
 #include "rhythmdb.h"
 #include "rb-debug.h"