diff -Nru ubuntu-settings-15.10.8/debian/changelog ubuntu-settings-16.10.1/debian/changelog
--- ubuntu-settings-15.10.8/debian/changelog	2016-04-14 15:30:24.000000000 +0000
+++ ubuntu-settings-16.10.1/debian/changelog	2016-08-02 11:13:09.000000000 +0000
@@ -1,12 +1,12 @@
-ubuntu-settings (15.10.8) xenial; urgency=medium
+ubuntu-settings (16.10.1) yakkety; urgency=medium
 
-  * debian/ubuntu-settings.override:
-    - gnome-software:
-      + Don't show the "Let's go shopping!" dialog on first launch - it
-        doesn't add much.
-      + Mark packages coming from Ubuntu as official (not '3rd party')
+  * data/ubuntu-settings.override: Some changes for Nautilus 3.20 (LP:
+    #1576576):
+    - Do not open subfolders on hover
+    - Change the default zoom level to small
+  * Remove ancient Conflicts & Replaces.
 
- -- Iain Lane <iain@orangesquash.org.uk>  Thu, 14 Apr 2016 16:30:24 +0100
+ -- Iain Lane <iain.lane@canonical.com>  Tue, 02 Aug 2016 12:10:40 +0100
 
 ubuntu-settings (15.10.7) xenial; urgency=medium
 
diff -Nru ubuntu-settings-15.10.8/debian/control ubuntu-settings-16.10.1/debian/control
--- ubuntu-settings-15.10.8/debian/control	2014-12-08 17:05:40.000000000 +0000
+++ ubuntu-settings-16.10.1/debian/control	2016-08-02 11:12:54.000000000 +0000
@@ -8,8 +8,6 @@
 
 Package: ubuntu-settings
 Architecture: all
-Conflicts: ubuntu-default-settings (<= 12.10.1)
-Replaces: ubuntu-default-settings (<= 12.10.1)
 Depends: ${misc:Depends}, libglib2.0-bin
 Description: default settings for the Ubuntu desktop
  This package contains the default settings used by Ubuntu.
diff -Nru ubuntu-settings-15.10.8/debian/ubuntu-settings.gsettings-override ubuntu-settings-16.10.1/debian/ubuntu-settings.gsettings-override
--- ubuntu-settings-15.10.8/debian/ubuntu-settings.gsettings-override	2016-04-14 08:29:45.000000000 +0000
+++ ubuntu-settings-16.10.1/debian/ubuntu-settings.gsettings-override	2016-08-02 11:03:51.000000000 +0000
@@ -78,9 +78,13 @@
 trash-icon-visible=false
 volumes-visible=false
 
+[org.gnome.nautilus.icon-view]
+default-zoom-level='small'
+
 [org.gnome.nautilus.preferences]
 sort-directories-first=true
 enable-interactive-search=true
+open-folder-on-dnd-hover=false
 
 [org.gnome.rhythmbox.encoding-settings]
 media-type-presets={'audio/x-vorbis':'Ubuntu', 'audio/mpeg':'Ubuntu'}
@@ -127,6 +131,3 @@
 [com.canonical.Unity8]
 usage-mode = 'Windowed'
 
-[org.gnome.software]
-first-run=false
-official-sources=['ubuntu-*']