diff --git a/.etckeeper b/.etckeeper
index 832e2d27..ea266b1c 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -881,6 +881,7 @@ maybe chmod 0644 'logcheck/ignore.d.server/rsyslog'
 maybe chmod 0644 'login.defs'
 maybe chmod 0644 'logrotate.conf'
 maybe chmod 0755 'logrotate.d'
+maybe chmod 0644 'logrotate.d/alternatives'
 maybe chmod 0644 'logrotate.d/apt'
 maybe chmod 0644 'logrotate.d/aptitude'
 maybe chmod 0644 'logrotate.d/dpkg'
@@ -916,7 +917,6 @@ maybe chmod 0755 'network'
 maybe chmod 0755 'network/if-down.d'
 maybe chmod 0755 'network/if-down.d/bind9'
 maybe chmod 0755 'network/if-down.d/resolvconf'
-maybe chmod 0755 'network/if-down.d/upstart'
 maybe chmod 0755 'network/if-post-down.d'
 maybe chmod 0755 'network/if-post-down.d/wireless-tools'
 maybe chmod 0755 'network/if-pre-up.d'
@@ -926,7 +926,6 @@ maybe chmod 0755 'network/if-up.d/000resolvconf'
 maybe chmod 0755 'network/if-up.d/avahi-daemon'
 maybe chmod 0755 'network/if-up.d/bind9'
 maybe chmod 0755 'network/if-up.d/openssh-server'
-maybe chmod 0755 'network/if-up.d/upstart'
 maybe chmod 0644 'network/interfaces'
 maybe chmod 0755 'network/interfaces.d'
 maybe chmod 0644 'networks'
@@ -1012,6 +1011,8 @@ maybe chmod 0644 'python2.7/sitecustomize.py'
 maybe chmod 0755 'python3'
 maybe chmod 0755 'python3.5'
 maybe chmod 0644 'python3.5/sitecustomize.py'
+maybe chmod 0755 'python3.6'
+maybe chmod 0644 'python3.6/sitecustomize.py'
 maybe chmod 0644 'python3/debian_config'
 maybe chmod 0755 'rc.local'
 maybe chmod 0755 'rc0.d'
diff --git a/alternatives/README b/alternatives/README
index 54ef7400..4c4d2156 100644
--- a/alternatives/README
+++ b/alternatives/README
@@ -1,2 +1,2 @@
-Please read the update-alternatives(8) man page for information on this
+Please read the update-alternatives(1) man page for information on this
 directory and its contents.
diff --git a/avahi/avahi-daemon.conf b/avahi/avahi-daemon.conf
index 95166f80..ff9a4c58 100644
--- a/avahi/avahi-daemon.conf
+++ b/avahi/avahi-daemon.conf
@@ -60,9 +60,9 @@ publish-workstation=no
 
 [rlimits]
 #rlimit-as=
-rlimit-core=0
-rlimit-data=4194304
-rlimit-fsize=0
-rlimit-nofile=768
-rlimit-stack=4194304
-rlimit-nproc=3
+#rlimit-core=0
+#rlimit-data=8388608
+#rlimit-fsize=0
+#rlimit-nofile=768
+#rlimit-stack=8388608
+#rlimit-nproc=3
diff --git a/cron.daily/dpkg b/cron.daily/dpkg
index c0aefb85..0a6b05e1 100755
--- a/cron.daily/dpkg
+++ b/cron.daily/dpkg
@@ -25,17 +25,6 @@ if cd /var/backups ; then
     # The alternatives database is independent from the dpkg database.
     dbalt=alternatives
 
-    # Switch the alternatives database backups from xz to gzip, as the latter
-    # is Essential and we can rely on it being always present, using xz here
-    # is not worth the trouble, disk space savings, or possible additional
-    # dependencies.
-    for dbseq in `seq 1 6` ; do
-        dbfile=${dbalt}.tar.${dbseq}
-        [ -e "${dbfile}.xz" ] || continue
-        unxz ${dbfile}.xz
-        gzip -9 $dbfile
-    done
-
     # XXX: Ideally we'd use --warning=none instead of discarding stderr, but
     # as of GNU tar 1.27.1, it does not seem to work reliably (see #749307).
     if ! test -e ${dbalt}.tar.0 ||
diff --git a/init.d/networking b/init.d/networking
index 28278467..b5380511 100755
--- a/init.d/networking
+++ b/init.d/networking
@@ -119,9 +119,6 @@ ifup_hotplug () {
 
 case "$1" in
 start)
-	if init_is_upstart; then
-		exit 1
-	fi
 	process_options
 	check_ifstate
 
@@ -147,9 +144,6 @@ start)
 	;;
 
 stop)
-	if init_is_upstart; then
-		exit 0
-	fi
 	check_network_file_systems
 	check_network_swap
 
@@ -162,9 +156,6 @@ stop)
 	;;
 
 reload)
-	if init_is_upstart; then
-		exit 1
-	fi
 	process_options
 
 	log_action_begin_msg "Reloading network interfaces configuration"
@@ -178,9 +169,6 @@ reload)
 	;;
 
 force-reload|restart)
-	if init_is_upstart; then
-		exit 1
-	fi
 	process_options
 
 	log_warning_msg "Running $0 $1 is deprecated because it may not re-enable some interfaces"
diff --git a/logrotate.d/alternatives b/logrotate.d/alternatives
new file mode 100644
index 00000000..41c8a9c0
--- /dev/null
+++ b/logrotate.d/alternatives
@@ -0,0 +1,9 @@
+/var/log/alternatives.log {
+	monthly
+	rotate 12
+	compress
+	delaycompress
+	missingok
+	notifempty
+	create 644 root root
+}
diff --git a/logrotate.d/dpkg b/logrotate.d/dpkg
index b071698a..cf36f081 100644
--- a/logrotate.d/dpkg
+++ b/logrotate.d/dpkg
@@ -7,12 +7,3 @@
 	notifempty
 	create 644 root root
 }
-/var/log/alternatives.log {
-	monthly
-	rotate 12
-	compress
-	delaycompress
-	missingok
-	notifempty
-	create 644 root root
-}
diff --git a/network/if-down.d/upstart b/network/if-down.d/upstart
deleted file mode 100755
index 51e20b3f..00000000
--- a/network/if-down.d/upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-if [ -e /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-fi
-
-if ! init_is_upstart; then
-    exit 0
-fi
-
-# Let's ignore meta entries (ifdown -a)
-if [ "$ADDRFAM" = "meta" ]; then
-    exit 0
-fi
-
-initctl emit -n net-device-down \
-	"IFACE=$IFACE" \
-	"LOGICAL=$LOGICAL" \
-	"ADDRFAM=$ADDRFAM" \
-	"METHOD=$METHOD"
diff --git a/network/if-up.d/upstart b/network/if-up.d/upstart
deleted file mode 100755
index 8690c863..00000000
--- a/network/if-up.d/upstart
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh -e
-MARK_DEV_PREFIX="/run/network/ifup."
-MARK_STATIC_NETWORK_EMITTED="/run/network/static-network-up-emitted"
-
-if [ -e /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-fi
-
-if ! init_is_upstart; then
-    exit 0
-fi
-
-# Let's ignore meta entries (ifup -a)
-if [ "$ADDRFAM" = "meta" ]; then
-    exit 0
-fi
-
-# lo emission handled by /etc/init/network-interface.conf
-if [ "$IFACE" != lo ]; then
-    initctl emit -n net-device-up \
-        "IFACE=$IFACE" \
-        "LOGICAL=$LOGICAL" \
-        "ADDRFAM=$ADDRFAM" \
-        "METHOD=$METHOD"
-fi
-
-get_auto_interfaces() {
-	# write to stdout a list of interfaces configured as 'auto' in interfaces(5)
-	local found=""
-	# stderr redirected as it outputs things like:
-	# Ignoring unknown interface eth0=eth0.
-	found=$(ifquery --list --allow auto 2>/dev/null) || return
-	set -- ${found}
-	echo "$@"
-}
-
-all_interfaces_up() {
-	# return true if all interfaces listed in /etc/network/interfaces as 'auto'
-	# are up.  if no interfaces are found there, then "all [given] were up"
-	local prefix="$1" iface=""
-	for iface in $(get_auto_interfaces); do
-		# if cur interface does is not up, then all have not been brought up
-		[ -f "${prefix}${iface}" ] || return 1
-	done
-	return 0
-}
-
-# touch our own "marker" indicating that this interface has been brought up.
-: > "${MARK_DEV_PREFIX}$IFACE"
-
-if all_interfaces_up "${MARK_DEV_PREFIX}" &&
-	mkdir "${MARK_STATIC_NETWORK_EMITTED}" 2>/dev/null; then
-	initctl emit --no-wait static-network-up
-fi
diff --git a/python3.6/sitecustomize.py b/python3.6/sitecustomize.py
new file mode 100644
index 00000000..89c67120
--- /dev/null
+++ b/python3.6/sitecustomize.py
@@ -0,0 +1,7 @@
+# install the apport exception handler if available
+try:
+    import apport_python_hook
+except ImportError:
+    pass
+else:
+    apport_python_hook.install()
diff --git a/systemd/journald.conf b/systemd/journald.conf
index d5544f15..12d79b33 100644
--- a/systemd/journald.conf
+++ b/systemd/journald.conf
@@ -39,3 +39,4 @@
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
 #MaxLevelWall=emerg
+#LineMax=48K
diff --git a/systemd/system.conf b/systemd/system.conf
index 96624873..fae7cab8 100644
--- a/systemd/system.conf
+++ b/systemd/system.conf
@@ -40,6 +40,7 @@
 #DefaultEnvironment=
 #DefaultCPUAccounting=no
 #DefaultIOAccounting=no
+#DefaultIPAccounting=no
 #DefaultBlockIOAccounting=no
 #DefaultMemoryAccounting=no
 #DefaultTasksAccounting=yes
@@ -60,3 +61,5 @@
 #DefaultLimitNICE=
 #DefaultLimitRTPRIO=
 #DefaultLimitRTTIME=
+#IPAddressAllow=
+#IPAddressDeny=