diff --git a/package/rygel/Config.in b/package/rygel/Config.in
index 86d6a38e1e..df48918833 100644
--- a/package/rygel/Config.in
+++ b/package/rygel/Config.in
@@ -3,7 +3,9 @@ config BR2_PACKAGE_RYGEL
 	depends on BR2_USE_WCHAR # gupnp-av
 	depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av
 	depends on BR2_USE_MMU # gupnp-av
+	select BR2_PACKAGE_GDK_PIXBUF
 	select BR2_PACKAGE_GUPNP_AV
+	select BR2_PACKAGE_GUPNP_DLNA
 	select BR2_PACKAGE_LIBGEE
 	select BR2_PACKAGE_LIBMEDIAART
 	select BR2_PACKAGE_SQLITE
@@ -37,10 +39,9 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE
 
 config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1
 	bool "gstreamer1"
-	select BR2_PACKAGE_GDK_PIXBUF
-	select BR2_PACKAGE_GUPNP_DLNA
 	select BR2_PACKAGE_GSTREAMER1
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES
 
 endchoice
 
diff --git a/package/rygel/rygel.hash b/package/rygel/rygel.hash
index 33b44aecc2..04b11ff54a 100644
--- a/package/rygel/rygel.hash
+++ b/package/rygel/rygel.hash
@@ -1,5 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.38/rygel-0.38.3.sha256sum:
-sha256  08c21a577f7bdad26446a75ffa32778b26842c3b1188165f0b19818559747d00  rygel-0.38.3.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.40/rygel-0.40.2.sha256sum:
+sha256  c9e8c736296d22c4defe959727a29d31437bbd2b7aa0c6470d6be24011050697  rygel-0.40.2.tar.xz
 
 # Locally calculated
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk
index 21c8ebee6a..c541cdc0ed 100644
--- a/package/rygel/rygel.mk
+++ b/package/rygel/rygel.mk
@@ -4,14 +4,16 @@
 #
 ################################################################################
 
-RYGEL_VERSION_MAJOR = 0.38
-RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).3
+RYGEL_VERSION_MAJOR = 0.40
+RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).2
 RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz
 RYGEL_SITE = http://ftp.gnome.org/pub/gnome/sources/rygel/$(RYGEL_VERSION_MAJOR)
 RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo)
 RYGEL_LICENSE_FILES = COPYING COPYING.logo
 RYGEL_DEPENDENCIES = \
+	gdk-pixbuf \
 	gupnp-av \
+	gupnp-dlna \
 	libgee \
 	libmediaart \
 	sqlite \
@@ -20,51 +22,42 @@ RYGEL_INSTALL_STAGING = YES
 
 RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 RYGEL_CONF_OPTS += \
-	--disable-apidocs \
-	--disable-coverage \
-	--disable-example-plugins \
-	--enable-external-plugin \
-	--enable-lms-plugin \
-	--enable-mpris-plugin \
-	--enable-ruih-plugin \
-	--disable-tracker-plugin
-
-ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y)
-RYGEL_DEPENDENCIES += gdk-pixbuf
-endif
+	-Dapi-docs=false \
+	-Dexamples=false \
+	-Dtests=false
+RYGEL_PLUGINS = external,lms,mpris,ruih
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-RYGEL_CONF_OPTS += --enable-introspection
+RYGEL_CONF_OPTS += -Dintrospection=enabled
 RYGEL_DEPENDENCIES += gobject-introspection
 else
-RYGEL_CONF_OPTS += --disable-introspection
+RYGEL_CONF_OPTS += -Dintrospection=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y)
 RYGEL_CONF_OPTS += \
-	--with-media-engine=gstreamer \
-	--enable-playbin-plugin \
-	--enable-media_export-plugin \
-	--enable-gst-launch-plugin
+	-Dengines=gstreamer \
+	-Dgstreamer=enabled
+RYGEL_PLUGINS += ,playbin,media-export,gst-launch
 RYGEL_DEPENDENCIES += \
-	gupnp-dlna \
 	gst1-plugins-base \
-	gstreamer1
+	gstreamer1 \
+	gstreamer1-editing-services
 else ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE),y)
 RYGEL_CONF_OPTS += \
-	--with-media-engine=simple \
-	--disable-playbin-plugin \
-	--disable-media_export-plugin \
-	--disable-gst-launch-plugin
+	-Dengines=simple \
+	-Dgstreamer=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
-RYGEL_CONF_OPTS += --with-ui
+RYGEL_CONF_OPTS += -Dgtk=enabled
 RYGEL_DEPENDENCIES += libgtk3
 else
-RYGEL_CONF_OPTS += --without-ui
+RYGEL_CONF_OPTS += -Dgtk=disabled
 endif
 
+RYGEL_CONF_OPTS += -Dplugins="$(RYGEL_PLUGINS)"
+
 define RYGEL_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/rygel/S99rygel \
 		$(TARGET_DIR)/etc/init.d/S99rygel
@@ -75,4 +68,4 @@ define RYGEL_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/usr/lib/systemd/system/rygel.service
 endef
 
-$(eval $(autotools-package))
+$(eval $(meson-package))