diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 8ed5cd3cd0a..ac22728b3a5 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.45 2009/12/22 00:31:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.46 2010/03/20 17:02:07 jasper Exp $
 
 COMMENT=		Gtk-based GUI client for the Gnutella Network
 
-DISTNAME=		gtk-gnutella-0.96.6
-PKGNAME=		${DISTNAME}p1
+DISTNAME=		gtk-gnutella-0.96.7
 CATEGORIES=     	net
 
 HOMEPAGE=		http://gtk-gnutella.sourceforge.net/
diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo
index 9b1dbec8eb9..114f0c48095 100644
--- a/net/gtk-gnutella/distinfo
+++ b/net/gtk-gnutella/distinfo
@@ -1,5 +1,5 @@
-MD5 (gtk-gnutella-0.96.6.tar.bz2) = D48SQfr1wgS3ek3f2HjBSA==
-RMD160 (gtk-gnutella-0.96.6.tar.bz2) = Da5q+axk+o11mAyv1VxaPp6xjf4=
-SHA1 (gtk-gnutella-0.96.6.tar.bz2) = MZQX6N4QSzORPgigquyMDyKmEp0=
-SHA256 (gtk-gnutella-0.96.6.tar.bz2) = Hp6ZUmWBNESGdamRrKWDsqa8rNwUS4qBYo4VBbRWfo8=
-SIZE (gtk-gnutella-0.96.6.tar.bz2) = 15739240
+MD5 (gtk-gnutella-0.96.7.tar.bz2) = stbfNeh+UgU8AjCnQ83bUg==
+RMD160 (gtk-gnutella-0.96.7.tar.bz2) = dWQI4MUU8eFZoeu7wDE/xpEwyfs=
+SHA1 (gtk-gnutella-0.96.7.tar.bz2) = u4alQZnSGQiXNeBXMTuUEbDjVqE=
+SHA256 (gtk-gnutella-0.96.7.tar.bz2) = bQkbyWL3hiGy3raYDyPjXJP9cXtvFI6IqCH89AXC/6U=
+SIZE (gtk-gnutella-0.96.7.tar.bz2) = 16273432
diff --git a/net/gtk-gnutella/patches/patch-Configure b/net/gtk-gnutella/patches/patch-Configure
index 88aed806dec..6e072c28180 100644
--- a/net/gtk-gnutella/patches/patch-Configure
+++ b/net/gtk-gnutella/patches/patch-Configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Configure,v 1.13 2009/04/27 11:57:18 jasper Exp $
---- Configure.orig	Sun Apr 26 20:09:45 2009
-+++ Configure	Sun Apr 26 20:11:39 2009
+$OpenBSD: patch-Configure,v 1.14 2010/03/20 17:02:07 jasper Exp $
+--- Configure.orig	Sat Mar  6 23:42:45 2010
++++ Configure	Thu Mar 18 19:05:29 2010
 @@ -320,7 +320,7 @@ d_nanosleep=''
  d_nls=''
  d_open3=''
@@ -10,7 +10,7 @@ $OpenBSD: patch-Configure,v 1.13 2009/04/27 11:57:18 jasper Exp $
  d_posix_fadvise=''
  d_posix_memalign=''
  d_pread=''
-@@ -1122,7 +1122,7 @@ for file in $*; do
+@@ -1123,7 +1123,7 @@ for file in $*; do
  			dir=`expr X$file : 'X\(.*\)/'`
  			file=`expr X$file : 'X.*/\(.*\)'`
  			./mkdirp $dir
@@ -19,8 +19,8 @@ $OpenBSD: patch-Configure,v 1.13 2009/04/27 11:57:18 jasper Exp $
  			;;
  		*)
  			sh <"$SRC/$file"
-@@ -4325,7 +4325,7 @@ case "$d_dbus" in
- 		echo "(I'll use '$dbusconfig' to gather that information.)"
+@@ -4324,7 +4324,7 @@ case "$d_dbus" in
+ 		echo "(I'll use '$dbusconfig' to gather that information.)" >&4
  
  		: Make sure we have a good enough version
 -		version=`$dbusconfig $modver`
@@ -28,7 +28,7 @@ $OpenBSD: patch-Configure,v 1.13 2009/04/27 11:57:18 jasper Exp $
  		case "$version" in
  		'') ;;
  		*)
-@@ -9351,15 +9351,6 @@ If you'd like to make any changes to the config.sh fil
+@@ -9501,15 +9501,6 @@ If you'd like to make any changes to the config.sh fil
  to configure things, do it as a shell escape now (e.g. !vi config.sh).
  
  EOM
diff --git a/net/gtk-gnutella/patches/patch-src_if_gnet_property_c b/net/gtk-gnutella/patches/patch-src_if_gnet_property_c
index 18be00611c8..e8aea4f08ba 100644
--- a/net/gtk-gnutella/patches/patch-src_if_gnet_property_c
+++ b/net/gtk-gnutella/patches/patch-src_if_gnet_property_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_if_gnet_property_c,v 1.2 2009/04/27 11:57:18 jasper Exp $
---- src/if/gnet_property.c.orig	Sun Mar 29 17:37:58 2009
-+++ src/if/gnet_property.c	Sun Apr 26 20:11:54 2009
+$OpenBSD: patch-src_if_gnet_property_c,v 1.3 2010/03/20 17:02:07 jasper Exp $
+--- src/if/gnet_property.c.orig	Sat Mar  6 23:42:56 2010
++++ src/if/gnet_property.c	Thu Mar 18 19:05:29 2010
 @@ -417,8 +417,8 @@ gboolean gnet_property_variable_download_require_urn  
  static const gboolean gnet_property_variable_download_require_urn_default = FALSE;
  gboolean gnet_property_variable_download_require_server_name     = TRUE;
@@ -12,7 +12,7 @@ $OpenBSD: patch-src_if_gnet_property_c,v 1.2 2009/04/27 11:57:18 jasper Exp $
  guint32  gnet_property_variable_quick_connect_pool_size     = 10;
  static const guint32  gnet_property_variable_quick_connect_pool_size_default = 10;
  guint32  gnet_property_variable_max_leaves     = 150;
-@@ -4286,7 +4286,7 @@ gnet_prop_init(void) {
+@@ -4353,7 +4353,7 @@ gnet_prop_init(void) {
      gnet_property->props[182].data.guint32.def   = (void *) &gnet_property_variable_max_ultrapeers_default;
      gnet_property->props[182].data.guint32.value = (void *) &gnet_property_variable_max_ultrapeers;
      gnet_property->props[182].data.guint32.choices = NULL;