diff --git a/common/shlibs b/common/shlibs
index 810de8a5c50..055436b6d3d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -819,6 +819,8 @@ libgrlnet-0.2.so.0 grilo-0.2.0_1
 libquvi.so.7 libquvi-0.4.0_1
 libepc-1.0.so.3 libepc-0.4.1_1
 libepc-ui-1.0.so.3 libepc-0.4.1_1
+libgupnp-dlna-2.0.so.3 gupnp-dlna-0.10.0_1
+libgupnp-dlna-gst-2.0.so.3 gupnp-dlna-0.10.0_1
 libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1
 libtracker-common.so.0 libtracker-0.14.0_1
 libtracker-data.so.0 libtracker-0.14.0_1
@@ -1088,9 +1090,10 @@ libcheese-gtk.so.23 libcheese-3.6.0_1
 libSoundTouch.so.0 soundtouch-1.7.0_1
 libzapojit-0.0.so.0 libzapojit-0.0.2_1
 libmusicbrainz5.so.0 libmusicbrainz5-5.0.1_1
-librygel-core-1.0.so.0 librygel-0.16.0_1
-librygel-renderer-1.0.so.0 librygel-0.16.0_1
-librygel-server-1.0.so.0 librygel-0.16.0_1
+librygel-core-2.0.so.1 rygel-0.18.0_1
+librygel-server-2.0.so.1 rygel-0.18.0_1
+librygel-renderer-2.0.so.1 rygel-0.18.0_1
+librygel-renderer-gst-2.0.so.1 rygel-0.18.0_1
 libharfbuzz.so.0 libharfbuzz-0.9.4_1
 libosinfo-1.0.so.0 libosinfo-0.2.0_1
 libspice-client-gtk-3.0.so.4 spice-gtk-0.14_1
diff --git a/srcpkgs/rygel/rygel-devel.template b/srcpkgs/rygel/rygel-devel.template
index ec7e7e6a22e..dc2eeeed094 100644
--- a/srcpkgs/rygel/rygel-devel.template
+++ b/srcpkgs/rygel/rygel-devel.template
@@ -1,7 +1,6 @@
 # Template file for 'rygel-devel'.
 #
-noarch=yes
-depends="libgee-devel gupnp-av-devel gstreamer-devel libuuid-devel
+depends="libgee08-devel gupnp-av-devel gstreamer-devel libuuid-devel
  glib-devel librygel-${version}_${revision}"
 short_desc="${short_desc} - development files"
 
@@ -9,4 +8,5 @@ do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/vala usr/share
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index a0265fb093c..3502e893ffc 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,18 +1,19 @@
 # Template file for 'rygel'
 pkgname=rygel
-version=0.16.4
+version=0.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-gst-launch-plugin"
 depends="hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool sqlite-devel vala-devel gtk+3-devel>=3.6.2
- libsoup-devel libgee-devel gssdp-devel>=0.12.0 gupnp-av-devel
- gupnp-dlna-devel tracker-devel"
+hostmakedepends="pkg-config intltool"
+makedepends="sqlite-devel vala-devel>=0.20 gtk+3-devel>=3.8
+ libsoup-devel libgee08-devel>=0.10 gupnp-av-devel>=0.12.1
+ gupnp-dlna-devel>=0.10 tracker-devel>=0.16"
 conf_files="/etc/rygel.conf"
 subpackages="${pkgname}-devel librygel"
 short_desc="GNOME home media solution"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-distfiles="${GNOME_SITE}/${pkgname}/0.16/${pkgname}-${version}.tar.xz"
-checksum=3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a
+distfiles="${GNOME_SITE}/${pkgname}/0.18/${pkgname}-${version}.tar.xz"
+checksum=13df00a0e09f6c2e88c8de7cbbd3a80f429fb0efca16ead0c318a18c6f950330