diff --git a/nemo-2.4.0-void-return-no-return.patch b/nemo-2.4.0-void-return-no-return.patch
deleted file mode 100644
index 5f18b41..0000000
--- a/nemo-2.4.0-void-return-no-return.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: nemo-2.4.0/libnemo-private/nemo-monitor.c
-===================================================================
---- nemo-2.4.0.orig/libnemo-private/nemo-monitor.c
-+++ nemo-2.4.0/libnemo-private/nemo-monitor.c
-@@ -78,6 +78,7 @@ schedule_call_consume_changes (void)
-       call_consume_changes_idle_id =
-           g_idle_add (call_consume_changes_idle_cb, NULL);
-   }
-+  return 0;
- }
- 
- static void
-Index: nemo-2.4.0/libnemo-private/nemo-action.c
-===================================================================
---- nemo-2.4.0.orig/libnemo-private/nemo-action.c
-+++ nemo-2.4.0/libnemo-private/nemo-action.c
-@@ -1240,6 +1240,7 @@ try_vector (const gchar *op, gint vector
-     } else if (g_strcmp0 (op, GREATER_THAN) == 0) {
-         return (vector > 0);
-     }
-+    return 0;
- }
- 
- static gboolean
diff --git a/nemo-2.8.0-void-return-no-return.patch b/nemo-2.8.0-void-return-no-return.patch
new file mode 100644
index 0000000..837719f
--- /dev/null
+++ b/nemo-2.8.0-void-return-no-return.patch
@@ -0,0 +1,20 @@
+--- a/libnemo-private/nemo-action.c
++++ b/libnemo-private/nemo-action.c
+@@ -1307,6 +1307,7 @@ check_gsettings_condition (NemoAction *a
+         g_strfreev (split);
+         return FALSE;
+     }
++    return 0;
+ }
+ 
+ static gboolean
+--- a/libnemo-private/nemo-monitor.c
++++ b/libnemo-private/nemo-monitor.c
+@@ -78,6 +78,7 @@ schedule_call_consume_changes (void)
+       call_consume_changes_idle_id =
+           g_idle_add (call_consume_changes_idle_cb, NULL);
+   }
++  return 0;
+ }
+ 
+ static void
diff --git a/nemo.changes b/nemo.changes
index 0f58673..c325917 100644
--- a/nemo.changes
+++ b/nemo.changes
@@ -41,6 +41,8 @@ Wed Oct 21 14:05:01 UTC 2015 - sor.alexei@meowr.ru
   * Re-add revealer animation on search bar.
   * Fix Query Editor Row not displaying.
 - Fix dependencies.
+- Rename and rebase nemo-2.4.0-void-return-no-return.patch to
+  nemo-2.8.0-void-return-no-return.patch
 - Some cleanup.
 
 -------------------------------------------------------------------
diff --git a/nemo.spec b/nemo.spec
index 7132166..41a4981 100644
--- a/nemo.spec
+++ b/nemo.spec
@@ -29,8 +29,8 @@ Url:            https://github.com/linuxmint/nemo
 Source:         https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks.
 Patch1:         %{name}-implicit-pointer-decl.patch
-# PATCH-FIX-UPSTREAM nemo-2.4.0-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks.
-Patch2:         %{name}-2.4.0-void-return-no-return.patch
+# PATCH-FIX-UPSTREAM nemo-2.8.0-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks.
+Patch2:         %{name}-2.8.0-void-return-no-return.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 BuildRequires:  gtk-doc