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-23 02:39:48.000000000 +0100
+++ budgie-desktop-10.4/debian/budgie-desktop.gsettings-override	2017-08-25 21:01:48.000000000 +0100
@@ -1,5 +1,2 @@
-[org.gnome.settings-daemon.plugins.xsettings]
+[org.gnome.settings-daemon.plugins.xsettings:Budgie]
 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-23 02:39:48.000000000 +0100
+++ budgie-desktop-10.4/debian/changelog	2017-08-25 21:02:12.000000000 +0100
@@ -1,3 +1,14 @@
+budgie-desktop (10.4-0ubuntu3) artful; 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