diff --git a/srcpkgs/gupnp/gupnp-devel.template b/srcpkgs/gupnp/gupnp-devel.template
index 51d629c6695..87e93e17735 100644
--- a/srcpkgs/gupnp/gupnp-devel.template
+++ b/srcpkgs/gupnp/gupnp-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'gupnp-devel'.
 #
-depends="python gssdp-devel glib-devel libxml2-devel libuuid-devel gupnp>=0.18.2"
+noarch=yes
+depends="python gssdp-devel glib-devel libxml2-devel libuuid-devel gupnp>=${version}"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-noarch=yes
-
 do_install() {
 	vmove usr/bin usr
 	vmove usr/include usr
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index 52b19839ef4..b507bf255a2 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,18 +1,16 @@
 # Template file for 'gupnp'
 pkgname=gupnp
-version=0.18.2
-homepage="http://gupnp.org/"
-distfiles="${GNOME_SITE}/gupnp/0.18/gupnp-$version.tar.xz"
+version=0.18.4
+revision=1
+subpackages="gupnp-devel"
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="pkg-config glib-devel libxml2-devel libuuid-devel gssdp-devel gobject-introspection"
-revision=1
 short_desc="GObject-based library for UPnP"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-checksum=3715fa56c1f351132cffe7d69127da1daada7ff50481838c6dbfd17d7182743d
+homepage="http://gupnp.org/"
+distfiles="${GNOME_SITE}/gupnp/0.18/gupnp-${version}.tar.xz"
+checksum=6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1
 long_desc="
  A GObject-based API for doing UPnP transparently."
-
-subpackages="gupnp-devel"
-