diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index 43dda2b95f4c..2e695de89d43 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	metalink
-PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTVERSION=	0.3.6
 CATEGORIES=	misc
-MASTER_SITES=	SF/${PORTNAME}s/Metalink%20commandline/${PORTVERSION}
+MASTER_SITES=	SF/metalinks/Metalink%20commandline/${PORTVERSION}
 PKGNAMESUFFIX?=	-tools
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Metalink generation tool
 
 LIB_DEPENDS=	gcrypt.16:${PORTSDIR}/security/libgcrypt \
-		boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
-		boost_program_options.4:${PORTSDIR}/devel/boost-libs \
-		boost_regex.4:${PORTSDIR}/devel/boost-libs
+		glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
+		gpg-error.0:${PORTSDIR}/security/libgpg-error \
+		sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
 
+USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	AWK="${AWK}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/misc/metalink-tools/distinfo b/misc/metalink-tools/distinfo
index 9270ec584d4d..06ae196584a6 100644
--- a/misc/metalink-tools/distinfo
+++ b/misc/metalink-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (metalink-0.3.3.tar.gz) = f1a92f1707a10195fefb00caaf3ace18
-SHA256 (metalink-0.3.3.tar.gz) = db9d2431268e848da763ecaa4e64278531f25ab6ee326702a14e21f2e1c8facb
-SIZE (metalink-0.3.3.tar.gz) = 1377914
+MD5 (metalink-0.3.6.tar.gz) = 6769e788a8d97de33eed0fb7962eff5a
+SHA256 (metalink-0.3.6.tar.gz) = c4dc2a995b82d4abe23856d28687a5b5e10b9b391acd8e247bd3791e63ae7e9a
+SIZE (metalink-0.3.6.tar.gz) = 223799