diff --git a/srcpkgs/mtr-x11 b/srcpkgs/mtr-x11
new file mode 120000
index 00000000000..cb69c6bd91b
--- /dev/null
+++ b/srcpkgs/mtr-x11
@@ -0,0 +1 @@
+mtr
\ No newline at end of file
diff --git a/srcpkgs/mtr/patches/headers.patch b/srcpkgs/mtr/patches/headers.patch
new file mode 100644
index 00000000000..3325f39a6eb
--- /dev/null
+++ b/srcpkgs/mtr/patches/headers.patch
@@ -0,0 +1,11 @@
+--- display.c.orig	2014-08-23 21:34:41.344688175 +0200
++++ display.c	2014-08-23 21:34:49.913688842 +0200
+@@ -30,7 +30,7 @@
+ #include "raw.h"
+ #include "dns.h"
+ #ifndef NO_IPINFO
+-#include <asn.h>
++#include "asn.h"
+ #endif
+ 
+ extern int DisplayMode;
diff --git a/srcpkgs/mtr/template b/srcpkgs/mtr/template
index 0534c3d5510..97667bf2318 100644
--- a/srcpkgs/mtr/template
+++ b/srcpkgs/mtr/template
@@ -1,7 +1,7 @@
 # Template file for 'mtr'
 pkgname=mtr
 version=0.85
-revision=2
+revision=3
 distfiles="https://github.com/traviscross/mtr/archive/v${version}.tar.gz"
 checksum="4c3c02cc8290798a067d514c9b243fdc90a75e58ca1a35da8e93a163f11c1884"
 build_style="gnu-configure"
@@ -10,8 +10,39 @@ makedepends="ncurses-devel gtk+-devel"
 maintainer="Steven R <dev@styez.com>"
 homepage="http://www.bitwizard.nl/mtr/"
 license="GPL"
-short_desc="Combines the functionality of traceroute and ping into one tool (CLI version)"
+short_desc="Combines the functionality of traceroute and ping into one tool"
 
 pre_configure() {
-    ./bootstrap.sh
+	./bootstrap.sh
+}
+
+do_configure() {
+	mkdir $wrksrc/build_nox $wrksrc/build_x11
+	cd $wrksrc/build_nox
+	$wrksrc/configure ${configure_args} --without-gtk
+
+	cd $wrksrc/build_x11
+	$wrksrc/configure ${configure_args}
+}
+
+do_build() {
+	for p in $wrksrc/build_nox $wrksrc/build_x11; do
+		cd $p
+		make ${makejobs}
+	done
+}
+
+do_install() {
+	cd $wrksrc/build_nox
+	make DESTDIR=$DESTDIR install
+}
+
+mtr-x11_package() {
+	provides="mtr-${version}_${revision}"
+	replaces="mtr>0"
+	short_desc+=" - X11 version"
+	pkg_install() {
+		cd $wrksrc/build_x11
+		make DESTDIR=$PKGDESTDIR install
+	}
 }