diff -Nru budgie-desktop-10.4/debian/budgie-desktop.gsettings-override budgie-desktop-10.4/debian/budgie-desktop.gsettings-override
--- budgie-desktop-10.4/debian/budgie-desktop.gsettings-override	2017-08-28 12:53:51.000000000 +0000
+++ budgie-desktop-10.4/debian/budgie-desktop.gsettings-override	2017-08-18 16:48:21.000000000 +0000
@@ -1,2 +1,5 @@
-[org.gnome.settings-daemon.plugins.xsettings:Budgie]
+[org.gnome.settings-daemon.plugins.xsettings]
 overrides={'Gtk/ShellShowsAppMenu': <0>, 'Gtk/DecorationLayout': <'menu:minimize,maximize,close'>}
+
+[com.solus-project.budgie-menu]
+menu-headers=false
diff -Nru budgie-desktop-10.4/debian/changelog budgie-desktop-10.4/debian/changelog
--- budgie-desktop-10.4/debian/changelog	2017-08-28 12:53:51.000000000 +0000
+++ budgie-desktop-10.4/debian/changelog	2017-08-18 16:48:21.000000000 +0000
@@ -1,33 +1,16 @@
-budgie-desktop (10.4-0ubuntu3) artful; urgency=medium
+budgie-desktop (10.4-1) unstable; urgency=medium
 
-  * Bug-fix release
-    - Do not override budgie menu settings. This should be distro
-      specific
-    - Add "Budgie" desktop override to ensure this package does
-      not trample over other desktops using the xsettings key
-      (LP: #1713071)
-
- -- David Mohammed <fossfreedom@ubuntu.com>  Fri, 25 Aug 2017 21:02:12 +0100
-
-budgie-desktop (10.4-0ubuntu2) artful; urgency=medium
-
-  * Merge in changes from Debian new queue for compatibility with
-    gnome-settings-daemon 3.25
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 22 Aug 2017 21:39:48 -0400
-
-budgie-desktop (10.4-0ubuntu1) artful; urgency=medium
-
-  * New upstream release (LP: #1711046)
+  * New upstream release
   * Packaging Changes
     - remove all unneeded triggers
+    - refresh debian/patches/gsd.patch to merge in upstream changes
+    - drop all patches (except for gsd.patch) since now dealt with in new
+      release
     - debian/control: standards version 4.0.1
     - debian/control: Add build dependency sassc
     - debian/control: add minimum meson version to build
     - debian/control: Add Build-Depends alternate libmutter-1-dev
       for GNOME 3.26 builds
-    - debian/control: correct typo in Vcs-Git
-    - drop all patches since now dealt with in new release
     - update library symbols files with 10.4 changes
     - Rename binary package gir1.2-budgie-desktop-1.0 to
       match the typelib gir1.2-budgie-1.0; To ensure a smooth upgrade,
@@ -43,11 +26,10 @@
       debian/changelog-announcement.txt to describe
       where to find the upstream announcement and description of changes
     - add budgie-core.lintian-override with comment to describe
-      the rpath lintian error; the error has not been overridden
-      in this file since it is valid but without any workaround
-
- -- David Mohammed <fossfreedom@ubuntu.com>  Tue, 15 Aug 2017 22:48:21 +0100
+      the rpath lintian error
 
+ -- David Mohammed <fossfreedom@ubuntu.com>  Fri, 18 Aug 2017 17:48:21 +0100
+ 
 budgie-desktop (10.3.1-5) unstable; urgency=high
 
   * Bug fix release
diff -Nru budgie-desktop-10.4/debian/control budgie-desktop-10.4/debian/control
--- budgie-desktop-10.4/debian/control	2017-08-23 01:39:48.000000000 +0000
+++ budgie-desktop-10.4/debian/control	2017-08-18 16:48:21.000000000 +0000
@@ -15,8 +15,7 @@
  libgnome-desktop-3-dev,
  libgnome-menu-3-dev,
  libgtk-3-dev,
- libmutter-0-dev (>= 3.24) | libmutter-1-dev (>= 3.25.90),
-# libmutter-dev (>= 3.18) | libmutter-0-dev (>= 3.24) | libmutter-1-dev (>= 3.25.90),
+ libmutter-dev (>= 3.18) | libmutter-0-dev (>= 3.24) | libmutter-1-dev (>= 3.25.90),
  libpeas-dev,
  libpolkit-agent-1-dev,
  libpolkit-gobject-1-dev,