diff --git a/0001-Revert-Fix-handling-email-addresses.patch b/0001-Revert-Fix-handling-email-addresses.patch
new file mode 100644
index 0000000..ca831ef
--- /dev/null
+++ b/0001-Revert-Fix-handling-email-addresses.patch
@@ -0,0 +1,28 @@
+From fa4aaa19a107c404b0dc5d707d9c299472e0884f Mon Sep 17 00:00:00 2001
+From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
+Date: Sat, 9 Dec 2017 13:51:35 +0100
+Subject: [PATCH] Revert "Fix handling email addresses"
+
+This reverts commit 5175d5ef5e6c9e92f4d296948528ac4bef35fe9d.
+---
+ terminal/terminal-widget.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
+index d65ebfd7..5494cff5 100644
+--- a/terminal/terminal-widget.c
++++ b/terminal/terminal-widget.c
+@@ -678,8 +678,8 @@ terminal_widget_open_uri (TerminalWidget *widget,
+             break;
+ 
+           case PATTERN_TYPE_EMAIL:
+-            uri = g_str_has_prefix (wlink, MAILTO "//")
+-                ? g_strdup (wlink) : g_strconcat (MAILTO "//", wlink, NULL);
++            uri = strncmp (wlink, MAILTO, strlen (MAILTO)) == 0
++                ? g_strdup (wlink) : g_strconcat (MAILTO, wlink, NULL);
+             break;
+ 
+           default:
+-- 
+2.15.1
+
diff --git a/xfce4-terminal.changes b/xfce4-terminal.changes
index 499f5ee..d95e012 100644
--- a/xfce4-terminal.changes
+++ b/xfce4-terminal.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 11 17:31:21 UTC 2017 - seife+obs@b1-systems.com
+
+- add 0001-Revert-Fix-handling-email-addresses.patch (boo#1071961,
+  bxo#14076) the "Fix handling email addresses" commit in 0.8.6
+  actually broke email address handling.
+
 -------------------------------------------------------------------
 Wed Nov 22 18:56:02 UTC 2017 - seife+obs@b1-systems.com
 
diff --git a/xfce4-terminal.spec b/xfce4-terminal.spec
index 33c61be..3142c41 100644
--- a/xfce4-terminal.spec
+++ b/xfce4-terminal.spec
@@ -25,6 +25,8 @@ License:        GPL-2.0+
 Group:          System/X11/Terminals
 Url:            http://docs.xfce.org/apps/terminal/start
 Source0:        http://archive.xfce.org/src/apps/xfce4-terminal/0.8/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM - revert wrong email address handling (boo#1071961, bxo#14076) - seife+dev@b1-systems.com
+Patch0:         0001-Revert-Fix-handling-email-addresses.patch
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -46,6 +48,7 @@ helps to save space on the desktop.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure