diff --git a/net/gupnp/core/Makefile b/net/gupnp/core/Makefile
index 62330186cad..d7c765fade1 100644
--- a/net/gupnp/core/Makefile
+++ b/net/gupnp/core/Makefile
@@ -1,25 +1,24 @@
-# $OpenBSD: Makefile,v 1.17 2012/12/02 19:29:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2013/03/28 19:43:41 jasper Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		framework for creating UPnP devices and control points
 
 GNOME_PROJECT=		gupnp
-GNOME_VERSION=		0.18.4
-REVISION=		0
+GNOME_VERSION=		0.20.1
 
-SHARED_LIBS +=  gupnp-1.0            1.0      # 4.0
+SHARED_LIBS +=  gupnp-1.0            2.0      # 4.0
 
 MODULES=		devel/gettext \
 			lang/python \
 			x11/gnome
 
 WANTLIB += e2fs-uuid gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gssdp-1.0 gthread-2.0 m pcre soup-2.4 xml2 z ffi c pthread
+WANTLIB += gssdp-1.0 gthread-2.0 m pcre soup-2.4 xml2 z ffi pthread
 
 LIBTOOL_FLAGS+= 	--tag=disable-static
 
-MODGNOME_TOOLS= 	goi
+MODGNOME_TOOLS= 	goi vala
 LIB_DEPENDS=		net/gssdp>=0.12.2 \
 			sysutils/e2fsprogs>=1.41.4p5
 
diff --git a/net/gupnp/core/distinfo b/net/gupnp/core/distinfo
index 793a7f9e3b7..83321e0a928 100644
--- a/net/gupnp/core/distinfo
+++ b/net/gupnp/core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gupnp-0.18.4.tar.xz) = a0N9VxGyEiksYIBia5dIAmgxDaY2ps+TetYRkpGveKE=
-SIZE (gupnp-0.18.4.tar.xz) = 361524
+SHA256 (gupnp-0.20.1.tar.xz) = qYq2kol0KgdcmnZVZQ4NGUSjiGu3hRv0DtgmCKndrGE=
+SIZE (gupnp-0.20.1.tar.xz) = 368108
diff --git a/net/gupnp/core/patches/patch-libgupnp_Makefile_in b/net/gupnp/core/patches/patch-libgupnp_Makefile_in
deleted file mode 100644
index 7b73668ca90..00000000000
--- a/net/gupnp/core/patches/patch-libgupnp_Makefile_in
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-libgupnp_Makefile_in,v 1.1 2012/12/02 19:29:46 jasper Exp $
-
-From 6342b98715b84b3452ba7a9a83fff096d3a0fa55 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 06 Oct 2012 10:44:15 +0000
-Subject: Fix package in GIR
-
---- libgupnp/Makefile.in.orig	Sun Dec  2 20:24:59 2012
-+++ libgupnp/Makefile.in	Sun Dec  2 20:25:22 2012
-@@ -410,7 +410,8 @@ INTROSPECTION_GIRS = $(am__append_2)
- INTROSPECTION_SCANNER_ARGS = --warn-all			\
- 			     --symbol-prefix=gupnp	\
- 			     --identifier-prefix=GUPnP	\
--			     --add-include-path=$(top_srcdir)
-+			     --add-include-path=$(top_srcdir) \
-+			     --pkg-export=gupnp-1.0
- 
- INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
- @HAVE_INTROSPECTION_TRUE@GUPnP_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 Soup-2.4 GSSDP-1.0
diff --git a/net/gupnp/core/pkg/PLIST b/net/gupnp/core/pkg/PLIST
index ffe8b0567af..1005ebb814b 100644
--- a/net/gupnp/core/pkg/PLIST
+++ b/net/gupnp/core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2012/05/04 07:09:14 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.5 2013/03/28 19:43:41 jasper Exp $
 bin/gupnp-binding-tool
 include/gupnp-1.0/
 include/gupnp-1.0/libgupnp/
@@ -64,3 +64,5 @@ share/gtk-doc/html/gupnp/server-tutorial.html
 share/gtk-doc/html/gupnp/style.css
 share/gtk-doc/html/gupnp/tutorial.html
 share/gtk-doc/html/gupnp/up.png
+share/vala/vapi/gupnp-1.0.deps
+share/vala/vapi/gupnp-1.0.vapi