diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f30abc7ccc77..fa97c6313885 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,29 +7,31 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		http://gecko.cs.purdue.edu/gnunet/
-MASTER_SITE_SUBDIR=	gnunet
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	GNUnet-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14 \
-		autoconf213:${PORTSDIR}/devel/autoconf213
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 USE_GTK=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-do-configure:
-	@(cd ${WRKSRC} ; \
-	  ${ACLOCAL} ; \
-	  ${AUTOCONF} ; \
-	  ${AUTOHEADER} ; \
-	  ${AUTOMAKE} -a ; \
-	  ${CONFIGURE_SCRIPT})
+MAN1=		gnunet-download.1 gnunet-gtk.1 gnunet-insert-multi.1 \
+		gnunet-insert.1 gnunet-search.1 gnunetd.1
+MAN5=		gnunet.conf.5
+
+post-patch:
+	@${REINPLACE_CMD} 's|-pthread [\$$]CFLAGS|\$$CFLAGS|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index 269406219950..eda15996621e 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1 +1 @@
-MD5 (GNUnet-0.3.2.tar.bz2) = 33feae4f84acccd6c1122ff64b6c12ff
+MD5 (GNUnet-0.4.2.tar.bz2) = b820139fe4d9dcb7a9fad79e37b3c0a8
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index 3932d1651edd..442857aa38df 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -1,8 +1,9 @@
 bin/gnunet-download
 bin/gnunet-gtk
 bin/gnunet-insert
-bin/gnunet-insert-mp3
+bin/gnunet-insert-multi
 bin/gnunet-search
+bin/gnunet-stats
 bin/gnunetd
 lib/libgnunetcommon.a
 lib/libgnunetfilesharing.a
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index f30abc7ccc77..fa97c6313885 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -7,29 +7,31 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		http://gecko.cs.purdue.edu/gnunet/
-MASTER_SITE_SUBDIR=	gnunet
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	GNUnet-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14 \
-		autoconf213:${PORTSDIR}/devel/autoconf213
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 USE_GTK=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-do-configure:
-	@(cd ${WRKSRC} ; \
-	  ${ACLOCAL} ; \
-	  ${AUTOCONF} ; \
-	  ${AUTOHEADER} ; \
-	  ${AUTOMAKE} -a ; \
-	  ${CONFIGURE_SCRIPT})
+MAN1=		gnunet-download.1 gnunet-gtk.1 gnunet-insert-multi.1 \
+		gnunet-insert.1 gnunet-search.1 gnunetd.1
+MAN5=		gnunet.conf.5
+
+post-patch:
+	@${REINPLACE_CMD} 's|-pthread [\$$]CFLAGS|\$$CFLAGS|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/gnunet/distinfo b/net/gnunet/distinfo
index 269406219950..eda15996621e 100644
--- a/net/gnunet/distinfo
+++ b/net/gnunet/distinfo
@@ -1 +1 @@
-MD5 (GNUnet-0.3.2.tar.bz2) = 33feae4f84acccd6c1122ff64b6c12ff
+MD5 (GNUnet-0.4.2.tar.bz2) = b820139fe4d9dcb7a9fad79e37b3c0a8
diff --git a/net/gnunet/pkg-plist b/net/gnunet/pkg-plist
index 3932d1651edd..442857aa38df 100644
--- a/net/gnunet/pkg-plist
+++ b/net/gnunet/pkg-plist
@@ -1,8 +1,9 @@
 bin/gnunet-download
 bin/gnunet-gtk
 bin/gnunet-insert
-bin/gnunet-insert-mp3
+bin/gnunet-insert-multi
 bin/gnunet-search
+bin/gnunet-stats
 bin/gnunetd
 lib/libgnunetcommon.a
 lib/libgnunetfilesharing.a