diff --git a/epiphany-3.26.3.tar.xz b/epiphany-3.26.3.tar.xz
deleted file mode 100644
index 393c125..0000000
--- a/epiphany-3.26.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb50042496e704621db3d0213581b0f914c639e160522751f64c5e5f6e6040b5
-size 4410412
diff --git a/epiphany-3.26.4.tar.xz b/epiphany-3.26.4.tar.xz
new file mode 100644
index 0000000..10b1d5b
--- /dev/null
+++ b/epiphany-3.26.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea
+size 4418620
diff --git a/epiphany-session-rework-the-safety-check.patch b/epiphany-session-rework-the-safety-check.patch
new file mode 100644
index 0000000..c360289
--- /dev/null
+++ b/epiphany-session-rework-the-safety-check.patch
@@ -0,0 +1,65 @@
+From 370b87f27fa9ad8be201d33f4eb6cf5ec39e3f56 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Date: Thu, 14 Dec 2017 11:05:33 -0600
+Subject: session: Rework the safety check
+
+Tanty and I both lost our Epiphany sessions yesterday... we need to
+tighten up our URI sanity check. http:/// is a valid SoupURI, but it
+should never be saved in the session.
+---
+ src/ephy-session.c | 38 +++++++++++++++++++++++---------------
+ 1 file changed, 23 insertions(+), 15 deletions(-)
+
+diff --git a/src/ephy-session.c b/src/ephy-session.c
+index b07346f..64f135a 100644
+--- a/src/ephy-session.c
++++ b/src/ephy-session.c
+@@ -822,22 +822,30 @@ save_session_in_thread_finished_cb (GObject      *source_object,
+ static gboolean
+ session_seems_sane (GList *windows)
+ {
+-  GList *w;
+-  GList *t;
++  for (GList *w = windows; w != NULL; w = w->next) {
++    for (GList *t = ((SessionWindow *)w->data)->tabs; t != NULL; t = t->next) {
++      const char *url = ((SessionTab *)t->data)->url;
++      SoupURI *uri;
++      gboolean sane = FALSE;
++
++      /* Blank URLs can occur in some situations. Just ignore these, as they
++       * are harmless and not an indicator of a corrupted session. */
++      if (strcmp (url, "") == 0)
++        continue;
++
++      uri = soup_uri_new (url);
++      if (uri) {
++        if (uri->host != NULL ||
++            uri->scheme == SOUP_URI_SCHEME_DATA ||
++            uri->scheme == SOUP_URI_SCHEME_FILE)
++          sane = TRUE;
++        soup_uri_free (uri);
++      }
+ 
+-  for (w = windows; w != NULL; w = w->next) {
+-    for (t = ((SessionWindow *)w->data)->tabs; t != NULL; t = t->next) {
+-       const char *url = ((SessionTab *)t->data)->url;
+-       SoupURI *uri = soup_uri_new (url);
+-       if (uri) {
+-         soup_uri_free (uri);
+-       }
+-       /* Blank URLs can occur in some situations. Don't save them, but also
+-        * do not torpedo the entire session as it's not a bug. */
+-       else if (strcmp (url, "") != 0) {
+-         g_critical ("Refusing to save session due to invalid URL %s", url);
+-         return FALSE;
+-       }
++      if (!sane) {
++        g_critical ("Refusing to save session due to invalid URL %s", url);
++        return FALSE;
++      }
+     }
+   }
+ 
+-- 
+cgit v0.12
+
diff --git a/epiphany.changes b/epiphany.changes
index e47b923..14785dc 100644
--- a/epiphany.changes
+++ b/epiphany.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Dec 14 17:15:32 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.26.4:
+  + Fix sync failure warnings appearing multiple times
+    (bgo#790094).
+  + Fix tab sync and device name on accounts.firefox.com
+    (bgo#790370).
+  + Make default sync device name translatable (bgo#790905).
+  + Several additional misc. improvements to sync support
+    (including bgo#790819).
+  + Flatpak: custom stylesheets are now supported.
+  + Flatpak: view page source is now supported.
+- Add epiphany-session-rework-the-safety-check.patch: session:
+  Rework the safety check.
+
 -------------------------------------------------------------------
 Sun Nov 26 15:58:32 UTC 2017 - zaitor@opensuse.org
 
diff --git a/epiphany.spec b/epiphany.spec
index 2cc0b68..8c06451 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -17,7 +17,7 @@
 
 
 Name:           epiphany
-Version:        3.26.3
+Version:        3.26.4
 Release:        0
 Summary:        GNOME Web Browser
 License:        GPL-3.0+
@@ -25,6 +25,8 @@ Group:          Productivity/Networking/Web/Browsers
 Url:            http://www.gnome.org/projects/epiphany/
 Source0:        http://download.gnome.org/sources/epiphany/3.26/%{name}-%{version}.tar.xz
 Source99:       %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM epiphany-session-rework-the-safety-check.patch zaitor@opensuse.org -- session: Rework the safety check
+Patch0:         epiphany-session-rework-the-safety-check.patch
 BuildRequires:  fdupes
 BuildRequires:  meson
 BuildRequires:  pkgconfig
@@ -97,7 +99,7 @@ search results from Web (epiphany)
 %lang_package
 
 %prep
-%autosetup
+%autosetup -p1
 %if ! 0%{?is_opensuse}
 translation-update-upstream
 %endif