diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index e6184a33c7e0..d7eaf149b34f 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mtr
 PORTVERSION=	0.80
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		http://mirrors.evolva.ro/util/mtr/ \
@@ -15,28 +16,31 @@ MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 
+OPTIONS=	IPV6	"Build IPv6 support" on \
+		X11	"Build X11-enabled mtr" off
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 MAN8=		mtr.8
 PLIST_FILES=	sbin/mtr
 
-.if defined(WITHOUT_X11)
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--enable-ipv6
+.else
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+.if !defined(WITH_X11)
 CONFIGURE_ARGS+=--without-gtk
-PKGNAMESUFFIX=	-nox11
 .else
 CONFIGURE_ARGS+=--with-gtk
 USE_GNOME=	gtk20
+PKGNAMESUFFIX=	-x11
 .endif
 
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.else
-CONFIGURE_ARGS+=--enable-ipv6
-.endif
-
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|getopt.*$$(OBJEXT)||g ; \
@@ -44,10 +48,6 @@ post-patch:
 		 /getopt.*Po/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/mtr.c
-.if ${OSVERSION} < 700024
-	@${REINPLACE_CMD} -e \
-		's|-Wno-pointer-sign||' ${WRKSRC}/configure
-.endif
 
 post-install:
 	@${ECHO_MSG} ""
@@ -57,4 +57,4 @@ post-install:
 	@${ECHO_MSG} "in file ${WRKSRC}/SECURITY (not installed)"
 	@${ECHO_MSG} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 20f85285ef31..b4a959f1be73 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,3 +1,2 @@
-MD5 (mtr-0.80.tar.gz) = fa68528eaec1757f52bacf9fea8c68a9
 SHA256 (mtr-0.80.tar.gz) = 76bbdd97faf3b805933a50858549ddba895911d6891c6cc51db472567cff0ec0
 SIZE (mtr-0.80.tar.gz) = 272750