diff --git a/nemo-3.8.3.tar.gz b/nemo-3.8.3.tar.gz
deleted file mode 100644
index 9584647..0000000
--- a/nemo-3.8.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6111819d07a4d482ef71a5659ce09db0502026c5fc9653d3577b58d57540f049
-size 1424482
diff --git a/nemo-3.8.4.tar.gz b/nemo-3.8.4.tar.gz
new file mode 100644
index 0000000..6f62549
--- /dev/null
+++ b/nemo-3.8.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9397d7d67e9e45011273ff73c1ce9f7b9586ff6d7dbda4f143601b6387ac29d
+size 1424841
diff --git a/nemo-gtk-3.20.patch b/nemo-gtk-3.20.patch
new file mode 100644
index 0000000..816caf3
--- /dev/null
+++ b/nemo-gtk-3.20.patch
@@ -0,0 +1,15 @@
+--- a/eel/eel-gtk-extensions.c
++++ b/eel/eel-gtk-extensions.c
+@@ -287,7 +287,12 @@ eel_pop_up_context_menu (GtkMenu *menu,
+ 		button = 0;
+ 	}
+ 
++#if GTK_CHECK_VERSION (3, 22, 0)
+ 	gtk_menu_popup_at_pointer (menu, (GdkEvent *) event);
++#else
++	gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
++	                button, event ? event->time : GDK_CURRENT_TIME);
++#endif
+ 
+ 	g_object_ref_sink (menu);
+ 	g_object_unref (menu);
diff --git a/nemo.changes b/nemo.changes
index 3a0df61..8933692 100644
--- a/nemo.changes
+++ b/nemo.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Jul  5 13:05:25 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 3.8.4:
+  * nemo-progress-info.c: Emit signals in proper order to prevent
+    an unmatched g_application_hold/release in
+    nemo-progress-ui-handler.c.
+  * eel-gtk-extensions.c: Use gtk_menu_popup_at_pointer instead of
+    plain gtk_menu_popup, which is deprecated (and causes a lot of
+    warnings under wayland. Functionality under x11 is unchanged.
+  * nemo-file.c: Fix a couple pixbuf leaks, invalidate thumbnails
+    internally when a force refresh is commanded.
+  * various: Fix some memory leaks.
+- Add nemo-gtk-3.20.patch: Restore GTK+ 3.20 support.
+
 -------------------------------------------------------------------
 Sat Jun 16 15:48:41 UTC 2018 - sor.alexei@meowr.ru
 
diff --git a/nemo.spec b/nemo.spec
index b9e765d..b8c4f04 100644
--- a/nemo.spec
+++ b/nemo.spec
@@ -20,13 +20,15 @@
 %define sover   1
 %define typelib typelib-1_0-Nemo-3_0
 Name:           nemo
-Version:        3.8.3
+Version:        3.8.4
 Release:        0
 Summary:        File browser for Cinnamon
 License:        GPL-2.0-or-later
 Group:          System/GUI/Other
 URL:            https://github.com/linuxmint/nemo
 Source:         https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE nemo-gtk-3.20.patch -- Restore GTK+ 3.20 support.
+Patch0:         nemo-gtk-3.20.patch
 BuildRequires:  fdupes
 BuildRequires:  gtk-doc
 BuildRequires:  hicolor-icon-theme
@@ -103,6 +105,7 @@ This package provides the GObject Introspection bindings for Nemo.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if 0%{?suse_version} < 1500