diff --git a/data/etc/apt/apt.conf.d/60unattended-upgrades b/data/etc/apt/apt.conf.d/60unattended-upgrades
new file mode 100644
index 000000000..68290c1bc
--- /dev/null
+++ b/data/etc/apt/apt.conf.d/60unattended-upgrades
@@ -0,0 +1,7 @@
+// Remove unused automatically installed kernel-related packages
+// (kernel images, kernel headers and kernel version locked tools).
+Unattended-Upgrade::Remove-Unused-Kernel-Packages "true";
+
+// Do automatic removal of new unused dependencies after the upgrade
+// (equivalent to apt-get autoremove)
+Unattended-Upgrade::Remove-Unused-Dependencies "true";
diff --git a/setup.py b/setup.py
index 8f95d173a..0f0f241aa 100755
--- a/setup.py
+++ b/setup.py
@@ -233,6 +233,8 @@ setuptools.setup(
                  glob.glob('data/etc/apache2/sites-available/*.conf')),
                 ('/etc/apache2/includes',
                  glob.glob('data/etc/apache2/includes/*.conf')),
+                ('/etc/apt/apt.conf.d',
+                 glob.glob('data/etc/apt/apt.conf.d/60unattended-upgrades')),
                 ('/etc/avahi/services/',
                  glob.glob('data/etc/avahi/services/*.service')),
                 ('/etc/ikiwiki',