diff --git a/x11/gnome/grilo-plugins/Makefile b/x11/gnome/grilo-plugins/Makefile
index 8db5c6488f4..a8ac00e1b83 100644
--- a/x11/gnome/grilo-plugins/Makefile
+++ b/x11/gnome/grilo-plugins/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.7 2012/04/05 10:04:28 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2012/05/24 11:52:38 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	plugins for Grilo
 
 GNOME_PROJECT=	grilo-plugins
-GNOME_VERSION=	0.1.18
+GNOME_VERSION=	0.1.19
 API=		0.1
 
-REVISION=	2
-
 TRACKER_VERSION=0.14
 SUBST_VARS=	API TRACKER_VERSION
 
@@ -29,7 +27,7 @@ WANTLIB += gpg-error grilo-0.1 grlnet-0.1 gssdp-1.0 gthread-2.0
 WANTLIB += gupnp-1.0 gupnp-av-1.0 icui18n icuuc idn kvm lua m
 WANTLIB += nspr4 nss3 oauth pcre plc4 plds4 quvi rest-0.7 smime3
 WANTLIB += softokn3 soup-2.4 soup-gnome-2.4 sqlite3 ssl ssl3 tracker-sparql-0.14
-WANTLIB += xml2 z
+WANTLIB += xml2 z archive bz2 expat lzma totem-plparser
 WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-common
 WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-data
 
@@ -42,7 +40,7 @@ LIB_DEPENDS=	devel/libgdata \
 		net/librest \
 		net/quvi/libquvi \
 		security/nss \
-		x11/gnome/grilo \
+		x11/gnome/grilo>=0.1.19 \
 		x11/gnome/tracker>=0.14.0
 
 LIBTOOL_FLAGS=	--tag=disable-static
diff --git a/x11/gnome/grilo-plugins/distinfo b/x11/gnome/grilo-plugins/distinfo
index f4c73d0997d..439bca4fef8 100644
--- a/x11/gnome/grilo-plugins/distinfo
+++ b/x11/gnome/grilo-plugins/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/grilo-plugins-0.1.18.tar.xz) = e+pOprWMNF/6ne0Xe5F/8w==
-RMD160 (gnome/grilo-plugins-0.1.18.tar.xz) = wGEOUhchaF7lSZnEOZy4GP90Rkg=
-SHA1 (gnome/grilo-plugins-0.1.18.tar.xz) = xPsj+PNNIoJhEjoHaPLo58iNjz0=
-SHA256 (gnome/grilo-plugins-0.1.18.tar.xz) = fjgvQCEZ9PJwOAYnovSbMKbEOkfs1kW/X/5ODNmaHHk=
-SIZE (gnome/grilo-plugins-0.1.18.tar.xz) = 376696
+MD5 (gnome/grilo-plugins-0.1.19.tar.xz) = gSpCA7qepaGV491im/oX1g==
+RMD160 (gnome/grilo-plugins-0.1.19.tar.xz) = AD+GzF4m5S52Qez6pVYQtptc7so=
+SHA1 (gnome/grilo-plugins-0.1.19.tar.xz) = I9GYlWNH0TM2QJsHWtndIvpTQm8=
+SHA256 (gnome/grilo-plugins-0.1.19.tar.xz) = EBvoJobERl157IIhP5jsKgDakAFwbTPI9dLirlHdfn0=
+SIZE (gnome/grilo-plugins-0.1.19.tar.xz) = 383764
diff --git a/x11/gnome/grilo-plugins/pkg/PLIST b/x11/gnome/grilo-plugins/pkg/PLIST
index caf63c3b750..4f4d5c13f13 100644
--- a/x11/gnome/grilo-plugins/pkg/PLIST
+++ b/x11/gnome/grilo-plugins/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2012/02/23 11:29:46 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2012/05/24 11:52:38 jasper Exp $
 lib/grilo-${API}/
 lib/grilo-${API}/grl-apple-trailers.xml
 lib/grilo-${API}/grl-bliptv.xml
@@ -10,6 +10,7 @@ lib/grilo-${API}/grl-jamendo.xml
 lib/grilo-${API}/grl-lastfm-albumart.xml
 lib/grilo-${API}/grl-local-metadata.xml
 lib/grilo-${API}/grl-metadata-store.xml
+lib/grilo-${API}/grl-optical-media.xml
 lib/grilo-${API}/grl-podcasts.xml
 lib/grilo-${API}/grl-tracker.xml
 lib/grilo-${API}/grl-upnp.xml
@@ -35,6 +36,8 @@ lib/grilo-${API}/libgrllastfm-albumart.so
 lib/grilo-${API}/libgrllocalmetadata.so
 @comment lib/grilo-${API}/libgrlmetadatastore.la
 lib/grilo-${API}/libgrlmetadatastore.so
+@comment lib/grilo-${API}/libgrloptical-media.la
+lib/grilo-${API}/libgrloptical-media.so
 @comment lib/grilo-${API}/libgrlpodcasts.la
 lib/grilo-${API}/libgrlpodcasts.so
 @comment lib/grilo-${API}/libgrltracker.la
diff --git a/x11/gnome/grilo/Makefile b/x11/gnome/grilo/Makefile
index 71e125191b0..db7421693a3 100644
--- a/x11/gnome/grilo/Makefile
+++ b/x11/gnome/grilo/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2012/02/26 15:06:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2012/05/24 11:52:32 jasper Exp $
 
 COMMENT=	framework for making media discovery and browsing easy
 
 GNOME_PROJECT=	grilo
-GNOME_VERSION=	0.1.18
-
-REVISION=	0
+GNOME_VERSION=	0.1.19
 
 SHARED_LIBS +=  grilo-0.1            0.0      # unknown
-SHARED_LIBS +=  grlnet-0.1           0.0      # unknown
+SHARED_LIBS +=  grlnet-0.1           1.0      # unknown
 
 CATEGORIES+=	multimedia
 
diff --git a/x11/gnome/grilo/distinfo b/x11/gnome/grilo/distinfo
index e7b17aa51f9..6fb41c516d7 100644
--- a/x11/gnome/grilo/distinfo
+++ b/x11/gnome/grilo/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/grilo-0.1.18.tar.xz) = wvNHJ6/t9uL+utU7ICGDlQ==
-RMD160 (gnome/grilo-0.1.18.tar.xz) = 31p1NC8xmWB3e1YY7yTAVG0RTJc=
-SHA1 (gnome/grilo-0.1.18.tar.xz) = aiNyOF6D4ykGDEuAoXbxYJWwkaM=
-SHA256 (gnome/grilo-0.1.18.tar.xz) = 3FvB6nTtPUfE7C2UiGI0NGZxUJvcY84YH5iCTnF4roM=
-SIZE (gnome/grilo-0.1.18.tar.xz) = 493216
+MD5 (gnome/grilo-0.1.19.tar.xz) = 84fx99IJENPLrrPygZ19bw==
+RMD160 (gnome/grilo-0.1.19.tar.xz) = VETPV90nVRuEp047wmzi0wptpOk=
+SHA1 (gnome/grilo-0.1.19.tar.xz) = r4YXAkJgfCJw1HqgAuYSMX/nLws=
+SHA256 (gnome/grilo-0.1.19.tar.xz) = i4Qr7rZ535BpS2rU7XmlWoiqRfZnNSexsC3hfg3N0OU=
+SIZE (gnome/grilo-0.1.19.tar.xz) = 476636
diff --git a/x11/gnome/grilo/patches/patch-configure b/x11/gnome/grilo/patches/patch-configure
deleted file mode 100644
index dcab3cb68be..00000000000
--- a/x11/gnome/grilo/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2012/02/26 15:06:35 ajacoutot Exp $
-
-Fix build with vala>=0.15
-
---- configure.orig	Sun Feb 26 10:22:56 2012
-+++ configure	Sun Feb 26 10:23:02 2012
-@@ -12287,12 +12287,12 @@ fi
- $as_echo "$enable_vala" >&6; }
- if test "x$enable_vala" != "xno"; then
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libvala-0.14 \""; } >&5
--  ($PKG_CONFIG --exists --print-errors " libvala-0.14 ") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libvala-0.16 \""; } >&5
-+  ($PKG_CONFIG --exists --print-errors " libvala-0.16 ") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--   valapkg="libvala-0.14"
-+   valapkg="libvala-0.16"
- else
-    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libvala-0.12 \""; } >&5
diff --git a/x11/gnome/grilo/pkg/PLIST b/x11/gnome/grilo/pkg/PLIST
index 03a200a263d..3395b39c82d 100644
--- a/x11/gnome/grilo/pkg/PLIST
+++ b/x11/gnome/grilo/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/02/26 15:06:35 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/05/24 11:52:32 jasper Exp $
 %%SHARED%%
 @bin bin/grilo-simple-playlist
-@bin bin/grilo-test-ui
-@bin bin/grl-inspect
+@bin bin/grilo-test-ui-0.1
+@bin bin/grl-inspect-0.1
 include/grilo-0.1/
 include/grilo-0.1/grilo.h
 include/grilo-0.1/grl-config.h