diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index d784ad46d61..f17cb9a6887 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.52 2013/03/11 11:35:49 espie Exp $
+# $OpenBSD: Makefile,v 1.53 2013/04/01 14:08:26 sthen Exp $
 
 COMMENT=	Matt's traceroute - network diagnostic tool#'
 
 DISTNAME=	mtr-0.82
+REVISION=	0
 CATEGORIES=	net
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
@@ -12,17 +13,18 @@ HOMEPAGE=	http://www.bitwizard.nl/mtr/
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	yes
 
-WANTLIB=		c m termcap
+WANTLIB=	bind c m termcap
+LIB_DEPENDS=	net/libbind
 
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/
 
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/bind" \
+		LDFLAGS="-L${LOCALBASE}/lib -lbind"
 
 FLAVORS=	gtk
-
 FLAVOR?=
 .if ${FLAVOR} == "gtk"
-BROKEN= fails at runtime with "No nameservers defined"
 MODULES+=		devel/gettext
 CONFIGURE_ARGS+=	--with-gtk-prefix=${LOCALBASE}
 LIB_DEPENDS+=		x11/gtk+2
diff --git a/net/mtr/patches/patch-configure b/net/mtr/patches/patch-configure
deleted file mode 100644
index d0748410532..00000000000
--- a/net/mtr/patches/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Fri Dec  2 13:21:30 2011
-+++ configure	Mon May  7 22:20:59 2012
-@@ -5325,6 +5325,7 @@ _ACEOF
- 
- 
- ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
-+#include <sys/types.h>
- #include <netinet/in.h>
- #ifdef HAVE_SOCKET_H
- #include <socket.h>
-@@ -5342,6 +5343,7 @@ fi
- 
- 
- ac_fn_c_check_type "$LINENO" "struct in_addr" "ac_cv_type_struct_in_addr" "
-+#include <sys/types.h>
- #include <netinet/in.h>
- 
- "
diff --git a/net/mtr/patches/patch-gtk_c b/net/mtr/patches/patch-gtk_c
index 2d8be4d846c..2c6cb25b1d8 100644
--- a/net/mtr/patches/patch-gtk_c
+++ b/net/mtr/patches/patch-gtk_c
@@ -1,9 +1,10 @@
-$OpenBSD: patch-gtk_c,v 1.2 2010/08/19 16:56:45 jasper Exp $
+$OpenBSD: patch-gtk_c,v 1.3 2013/04/01 14:08:26 sthen Exp $
 
 Fix 64-bit issue.
+Fix with newer glib.
 
---- gtk.c.orig	Tue Jul 13 08:25:58 2010
-+++ gtk.c	Thu Aug 19 16:19:10 2010
+--- gtk.c.orig	Mon Feb 14 08:50:59 2011
++++ gtk.c	Mon Apr  1 14:50:24 2013
 @@ -21,6 +21,7 @@
  
  #include <stdio.h>
@@ -12,3 +13,11 @@ Fix 64-bit issue.
  #include <unistd.h>
  #include <sys/time.h>
  #include <sys/types.h>
+@@ -70,6 +71,7 @@ void gtk_do_init(int *argc, char ***argv) 
+   static int done = 0;
+ 
+   if(!done) {
++    g_type_init();
+     gtk_init(argc, argv);
+ 
+     done = 1;