diff -pruN 0.8.36+nmu1/can.defn 0.8.37/can.defn
--- 0.8.36+nmu1/can.defn	2021-08-18 23:33:27.000000000 +0000
+++ 0.8.37/can.defn	2021-10-12 13:07:41.000000000 +0000
@@ -13,7 +13,8 @@ method static
     listenonly listenonly	-- listen only mode (on|off)
     triple triple		-- activate triple sampling (on|off)
     oneshot oneshot		-- one shot mode (on|off)
-    berr berr			-- activate berr reporting (on|off) 
+    berr berr			-- activate berr reporting (on|off)
+    restart-ms restart-ms	-- restart-ms (0..)
 
   up
     ip link set %iface% type can bitrate %bitrate%
@@ -22,6 +23,7 @@ method static
     [[ ip link set %iface% type can triple-sampling %triple% ]]
     [[ ip link set %iface% type can one-shot %oneshot% ]]
     [[ ip link set %iface% type can berr-reporting %berr% ]]
+    [[ ip link set %iface% type can restart-ms %restart-ms% ]]
     ip link set %iface% up
 
   down
diff -pruN 0.8.36+nmu1/debian/changelog 0.8.37/debian/changelog
--- 0.8.36+nmu1/debian/changelog	2021-08-18 23:33:37.000000000 +0000
+++ 0.8.37/debian/changelog	2022-01-19 19:55:17.000000000 +0000
@@ -1,3 +1,16 @@
+ifupdown (0.8.37) unstable; urgency=low
+
+  * Add debian/gbp.conf
+  * Acknowledge 0.8.36+nmu1.
+  * Add timeout for IPv6 stateless dhcp. Thanks to Joerg Dorchain <joerg@dorchain.net>
+    (Closes: #947234)
+  * Correctly copy (duplicate) the interface to exclude with --read-environment. Thanks to Adam Stephens <adam.stephens@gmail.com>
+    (Closes: #994745)
+  * Include restart-ms option in can config. Thanks to Joerg Dorchain <joerg@dorchain.net>
+    (Closes: #947233)
+
+ -- Santiago Ruano Rincón <santiago@debian.org>  Wed, 19 Jan 2022 20:55:17 +0100
+
 ifupdown (0.8.36+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -pruN 0.8.36+nmu1/debian/gbp.conf 0.8.37/debian/gbp.conf
--- 0.8.36+nmu1/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 0.8.37/debian/gbp.conf	2021-09-14 13:30:30.000000000 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-tag = %(version)s
diff -pruN 0.8.36+nmu1/inet6.defn 0.8.37/inet6.defn
--- 0.8.36+nmu1/inet6.defn	2021-08-18 23:33:27.000000000 +0000
+++ 0.8.37/inet6.defn	2021-09-22 07:50:14.000000000 +0000
@@ -31,7 +31,7 @@ method auto
     /lib/ifupdown/wait-for-ll6.sh if (var_true("dhcp", ifd) && execable("/lib/ifupdown/wait-for-ll6.sh"))
     /sbin/dhclient -6 -v -P -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (var_true("dhcp", ifd) && execable("/sbin/dhclient") && var_true("request_prefix", ifd))
-    /sbin/dhclient -6 -v -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    /sbin/dhclient -6 -1 -v -S -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases -I -df /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (var_true("dhcp", ifd) && execable("/sbin/dhclient"))
     echo 'No DHCPv6 client software found!' >&2; false \
         elsif (var_true("dhcp", ifd))
diff -pruN 0.8.36+nmu1/main.c 0.8.37/main.c
--- 0.8.36+nmu1/main.c	2021-08-18 23:30:46.000000000 +0000
+++ 0.8.37/main.c	2022-01-19 17:02:22.000000000 +0000
@@ -419,7 +419,7 @@ static void parse_environment_variables(
 			excludeint = realloc(excludeint, excludeints * sizeof *excludeint);
 			if (excludeint == NULL)
 				err(1, "realloc");
-			excludeint[excludeints - 1] = tok;
+			excludeint[excludeints - 1] = strdup(tok);
 		}
 		free(excludes);
 	}