diff --git a/.gitignore b/.gitignore
index bc31daf..7cc1b90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,6 @@ mtr-0.79.tar.gz
 /mtr-0.84.tar.gz
 /mtr-0.85.tar.gz
 /mtr-0.85.tar.xz
-/mtr-gtk-pkexec-wrapper.sh
-/org.fedoraproject.mtr.policy
-/net-xmtr.desktop
 /generate-tarball.sh
 /mtr-0.86.tar.gz
+/mtr-0.87.tar.gz
diff --git a/mtr-gtk-pkexec-wrapper.sh b/mtr-gtk-pkexec-wrapper.sh
new file mode 100644
index 0000000..b1f26f2
--- /dev/null
+++ b/mtr-gtk-pkexec-wrapper.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/pkexec /usr/bin/xmtr.bin
diff --git a/mtr.spec b/mtr.spec
index f35fba9..7648d16 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -2,8 +2,8 @@
 
 Summary: A network diagnostic tool
 Name: mtr
-Version: 0.86
-Release: 2%{?dist}
+Version: 0.87
+Release: 1%{?dist}
 Epoch: 2
 Group: Applications/Internet
 License: GPLv2+
@@ -16,6 +16,8 @@ Source3: org.fedoraproject.mtr.policy
 BuildRequires: ncurses-devel gtk2-devel desktop-file-utils
 BuildRequires: autoconf automake libtool
 
+Patch1: 0001-Don-t-copy-Makefile.dist-to-Makefile-in-distclean.patch
+
 %description
 Mtr is a network diagnostic tool that combines ping and traceroute
 into one program. Mtr provides two interfaces: an ncurses interface,
@@ -32,12 +34,13 @@ The mtr-gtk package provides the GTK+ interface for the mtr network
 diagnostic tool.
 
 %prep
-%setup -q
+%autosetup -S git_am
 
 %build
 export CFLAGS="%{optflags} -fPIE"
 export LDFLAGS="-z now -pie"
 
+./bootstrap.sh
 %configure --enable-gtk2
 make %{?_smp_mflags} && mv mtr xmtr.bin && make distclean
 %configure --without-gtk
@@ -77,6 +80,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Feb 28 2017 Michal Sekletar <msekleta@redhat.com> - 2:0.87-1
+- Rebase to latest upstream (#1365128)
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.86-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/net-xmtr.desktop b/net-xmtr.desktop
new file mode 100644
index 0000000..a5570fa
--- /dev/null
+++ b/net-xmtr.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Traceroute
+Type=Application
+Comment=Traces packets between two network hosts
+Exec=xmtr
+Terminal=false
+Icon=mtr_icon.xpm
+Encoding=UTF-8
+X-Desktop-File-Install-Version=0.2
+Categories=System;Application;
diff --git a/org.fedoraproject.mtr.policy b/org.fedoraproject.mtr.policy
new file mode 100644
index 0000000..f9e68b4
--- /dev/null
+++ b/org.fedoraproject.mtr.policy
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+   <action id="org.fedoraproject.mtr.pkexec.run">
+    <description>Run mtr</description>
+    <message>Authentication is required to run traceroute</message>
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/xmtr.bin</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+   </action>
+</policyconfig>
diff --git a/sources b/sources
index c142e79..b6f833f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-cf6e427e5ce1d342057aec1a1544e089  net-xmtr.desktop
-c4fb53f4fdb3bbccdace06d34be87dd0  org.fedoraproject.mtr.policy
-8a65f6aec5e2d5f1a665aa76ae649bc9  mtr-gtk-pkexec-wrapper.sh
-8d63592c9d4579ef20cf491b41843eb2  mtr-0.86.tar.gz
+SHA512 (mtr-0.87.tar.gz) = 05cbe3928fef348e9c0794ad5b20e3c33c9319155d7c15eb16dc247e26812a1d16ff2fe2631f463fa15ee632f1e8ca4045866ff5ea7e6bbb8bb1e1e6a604b98c