diff -Nru tofrodos-1.7.13+ds/debian/changelog tofrodos-1.7.13+ds/debian/changelog
--- tofrodos-1.7.13+ds/debian/changelog	2015-10-29 13:42:39.000000000 +0000
+++ tofrodos-1.7.13+ds/debian/changelog	2017-06-23 16:31:09.000000000 +0000
@@ -1,8 +1,15 @@
-tofrodos (1.7.13+ds-2ubuntu1) xenial; urgency=low
+tofrodos (1.7.13+ds-3) unstable; urgency=medium
 
-  * Merge from Debian unstable. No remaining changes.
+  * Fix FTCBFS: Let dh_auto_build pass cross flags.
+    Thanks to Helmut Grohne for the report and patch. (Closes: #843921)
+  * Mark tofrodos Multi-Arch: foreign.
+    Thanks to Helmut Grohne for the report and patch. (Closes: #851199)
+  * Switch to compat level 10.
+  * Declare compliance with Debian Policy 4.0.0.
+  * Vcs-Git: Use https.
+  * Update copyright years and use https for Format field.
 
- -- Chris J Arges <chris.j.arges@canonical.com>  Thu, 29 Oct 2015 08:35:30 -0500
+ -- Markus Koschany <apo@debian.org>  Fri, 23 Jun 2017 18:31:09 +0200
 
 tofrodos (1.7.13+ds-2) unstable; urgency=medium
 
@@ -15,12 +22,6 @@
 
  -- Markus Koschany <apo@debian.org>  Wed, 28 Oct 2015 23:12:39 +0100
 
-tofrodos (1.7.13+ds-1ubuntu1) trusty; urgency=low
-
-  * Fix a FTBFS due to dpkg-parsechangelog failure. 
-
- -- Chris J Arges <chris.j.arges@ubuntu.com>  Thu, 07 Nov 2013 11:04:29 -0600
-
 tofrodos (1.7.13+ds-1) unstable; urgency=low
 
   [ Alexander Reichle-Schmehl ]
@@ -316,4 +317,3 @@
   * New packaging scheme instituted
 
  -- Michael Alan Dorman <mdorman@debian.org>  Fri,  4 Jul 1997 20:57:19 -0400
-
diff -Nru tofrodos-1.7.13+ds/debian/compat tofrodos-1.7.13+ds/debian/compat
--- tofrodos-1.7.13+ds/debian/compat	2015-10-29 04:11:37.000000000 +0000
+++ tofrodos-1.7.13+ds/debian/compat	2017-06-23 16:31:09.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru tofrodos-1.7.13+ds/debian/control tofrodos-1.7.13+ds/debian/control
--- tofrodos-1.7.13+ds/debian/control	2015-10-29 13:34:48.000000000 +0000
+++ tofrodos-1.7.13+ds/debian/control	2017-06-23 16:31:09.000000000 +0000
@@ -3,14 +3,15 @@
 Priority: optional
 Maintainer: Markus Koschany <apo@debian.org>
 Build-Depends:
- debhelper (>= 9)
-Standards-Version: 3.9.6
+ debhelper (>= 10)
+Standards-Version: 4.0.0
 Homepage: http://www.thefreecountry.com/tofrodos/index.shtml
-Vcs-Git: git://anonscm.debian.org/collab-maint/tofrodos.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/tofrodos.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/tofrodos.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/tofrodos.git
 
 Package: tofrodos
 Architecture: any
+Multi-Arch: foreign
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
diff -Nru tofrodos-1.7.13+ds/debian/copyright tofrodos-1.7.13+ds/debian/copyright
--- tofrodos-1.7.13+ds/debian/copyright	2015-10-29 04:11:37.000000000 +0000
+++ tofrodos-1.7.13+ds/debian/copyright	2017-06-23 16:31:09.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Tofrodos
 Source: http://www.thefreecountry.com/tofrodos/index.shtml
 Files-Excluded:
@@ -11,7 +11,7 @@
 Files: debian/*
 Copyright: 2005-2006, Florian Ernst <florian@debian.org>
            2008-2011, Alexander Reichle-Schmehl <tolimar@debian.org>
-           2013-2015, Markus Koschany <apo@debian.org>
+           2013-2017, Markus Koschany <apo@debian.org>
 License: GPL-2
 
 License: GPL-2
diff -Nru tofrodos-1.7.13+ds/debian/rules tofrodos-1.7.13+ds/debian/rules
--- tofrodos-1.7.13+ds/debian/rules	2015-10-29 13:35:16.000000000 +0000
+++ tofrodos-1.7.13+ds/debian/rules	2017-06-23 16:31:09.000000000 +0000
@@ -7,18 +7,17 @@
 
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=src
 
 override_dh_auto_clean:
-	cd $(CURDIR)/src \
-	&& $(MAKE) clean \
-	&& $(RM) -r -v fromdos todos
+	dh_auto_clean
+	$(RM) -r -v src/fromdos src/todos
 
 override_dh_auto_build:
-	cd $(CURDIR)/src && $(MAKE) CDEBUG="$(CFLAGS)" LDEBUG="$(LDFLAGS)"
+	dh_auto_build -- CDEBUG="$(CFLAGS)" LDEBUG="$(LDFLAGS)"
 
 override_dh_auto_install:
-	cd $(CURDIR)/src && $(MAKE) install \
+	dh_auto_install -- \
 		BINDIR=$(CURDIR)/debian/tofrodos/usr/bin \
 		MANDIR=$(CURDIR)/debian/tofrodos/usr/share/man/man1