diff -Nru oldsys-preseed-3.19/debian/changelog oldsys-preseed-3.20/debian/changelog
--- oldsys-preseed-3.19/debian/changelog	2015-08-16 12:12:47.000000000 +0000
+++ oldsys-preseed-3.20/debian/changelog	2016-02-13 14:17:01.000000000 +0000
@@ -1,3 +1,13 @@
+oldsys-preseed (3.20) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
+
+  [ Roger Shimizu ]
+  * Add support for device tree based Buffalo Linkstation (Closes: #814342).
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 13 Feb 2016 15:17:01 +0100
+
 oldsys-preseed (3.19) unstable; urgency=medium
 
   * Use "-a" for grep in get_var() to avoid FTBFS under various locales,
diff -Nru oldsys-preseed-3.19/debian/control oldsys-preseed-3.20/debian/control
--- oldsys-preseed-3.19/debian/control	2013-07-22 00:30:56.000000000 +0000
+++ oldsys-preseed-3.20/debian/control	2016-01-30 04:06:03.000000000 +0000
@@ -4,8 +4,8 @@
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Martin Michlmayr <tbm@cyrius.com>, Christian Perrier <bubulle@debian.org>
 Build-Depends: debhelper (>= 9), devio
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/oldsys-preseed.git
-Vcs-Git: git://anonscm.debian.org/d-i/oldsys-preseed.git
+Vcs-Browser: https://anonscm.debian.org/cgit/d-i/oldsys-preseed.git
+Vcs-Git: https://anonscm.debian.org/git/d-i/oldsys-preseed.git
 
 Package: oldsys-preseed
 Package-Type: udeb
diff -Nru oldsys-preseed-3.19/oldsys-preseed oldsys-preseed-3.20/oldsys-preseed
--- oldsys-preseed-3.19/oldsys-preseed	2015-07-28 19:37:11.000000000 +0000
+++ oldsys-preseed-3.20/oldsys-preseed	2016-02-13 04:03:00.000000000 +0000
@@ -120,7 +120,8 @@
 		else
 		    dt_model="UNKNOWN"
 		fi
-		if echo "$machine" | grep -q "^Buffalo/Revogear Kurobox Pro"; then
+		if echo "$machine" | grep -q "^Buffalo/Revogear Kurobox Pro" ||
+		    echo "$dt_model" | grep -q "^Buffalo/Revogear Kurobox Pro"; then
 			check_file /proc/mtd
 			rootfs=$(get_mtdblock "rootfs")
 			if [ -z "$rootfs" ]; then
@@ -161,7 +162,8 @@
 			rmdir $path/rootfs $path || true
 		elif echo "$machine" | grep -q "^Buffalo Linkstation Pro/Live" ||
 		   echo "$machine" | grep -q "^Buffalo Linkstation LiveV3 (LS-CHL)" ||
-		   echo "$machine" | grep -q "^Buffalo Linkstation Mini"; then
+		   echo "$machine" | grep -q "^Buffalo Linkstation Mini" ||
+		   echo "$dt_model" | grep -q "^Buffalo Linkstation"; then
 			# the default filesystem for the system partition is XFS, which isn't included
 			# in our startup environment.  However, customized boxes might have ext3
 			# instead, so try to mount anyway.
@@ -172,6 +174,7 @@
 			INTERFACE=eth0
 			parse_unix_tree $path/rootfs
 			info=$path/rootfs/etc/melco/info
+			NET_CONFIG=dhcp
 			if [ -e "$info" ]; then
 				HOSTNAME=$(sed -n '/^hostname/ {s/.*=//; p}' "$info")
 				usage=$(sed -n '/^my_ipaddress/ {s/.*=//; p}' "$info")
@@ -301,14 +304,6 @@
 			fi
 			umount $path/sda1 || true
 			rmdir $path/sda1 $path || true
-		elif echo "$dt_model" | grep -q "^Buffalo Linkstation LS-XHL" ||
-		   echo "$dt_model" | grep -q "^Buffalo Linkstation LS-CHLv2"; then
-			NET_CONFIG=dhcp
-			IPADDRESS=192.168.1.100
-			NETMASK=255.255.255.0
-			GATEWAY=192.168.1.1
-			NAMESERVERS=192.168.1.1
-			dhcp_fallback $FILE
 		elif echo "$machine" | grep -q "^LaCie" ||
 		   echo "$dt_model" | grep -q "^LaCie"; then
 			NET_CONFIG=dhcp