diff -Nru libtheora-1.1.1+dfsg.1/debian/changelog libtheora-1.1.1+dfsg.1/debian/changelog
--- libtheora-1.1.1+dfsg.1/debian/changelog	2016-01-24 09:54:49.000000000 +0000
+++ libtheora-1.1.1+dfsg.1/debian/changelog	2016-02-07 10:58:08.000000000 +0000
@@ -1,10 +1,19 @@
+libtheora (1.1.1+dfsg.1-8) unstable; urgency=medium
+
+  * Fix arch-independent build. (Closes: #806063)
+  * Drop unused build dependency python, to make it easier to
+    cross-build package.  (Closes: #794591)
+  * Acknowledge 1.1.1+dfsg.1-7.1 NMU. (Closes: #812478)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 07 Feb 2016 10:51:32 +0000
+
 libtheora (1.1.1+dfsg.1-7.1) unstable; urgency=medium
 
   * Non-maintainer upload.
   * Fix FTBFS with libpng16 (Closes: #809949)
   * Drop python from B-D for easier cross building (Closes: #794591)
 
- -- Tobias Frost <tobi@debian.org>  Sun, 24 Jan 2016 10:54:49 +0100
+ -- Tobias Frost <tobi@debian.org>  Sat, 23 Jan 2016 18:44:30 +0100
 
 libtheora (1.1.1+dfsg.1-7) unstable; urgency=low
 
diff -Nru libtheora-1.1.1+dfsg.1/debian/patches/0006-libpng16.patch libtheora-1.1.1+dfsg.1/debian/patches/0006-libpng16.patch
--- libtheora-1.1.1+dfsg.1/debian/patches/0006-libpng16.patch	1970-01-01 00:00:00.000000000 +0000
+++ libtheora-1.1.1+dfsg.1/debian/patches/0006-libpng16.patch	2016-02-07 10:45:17.000000000 +0000
@@ -0,0 +1,22 @@
+Description: Fix build problem with libpng16.
+ Backport fix from upstream to use sizeof() instead of png_sizeof().
+Author: Tristan Matthew <le.businessman@gmail.com>
+Bug-Debian: https://bugs.debian.org/809949
+Origin: backport, https://git.xiph.org/?p=theora.git;a=commitdiff;h=7288b539c52e99168488dc3a343845c9365617c8
+
+Index: libtheora/examples/png2theora.c
+===================================================================
+--- libtheora.orig/examples/png2theora.c	2016-02-07 10:37:24.586795794 +0000
++++ libtheora/examples/png2theora.c	2016-02-07 10:38:11.983361108 +0000
+@@ -462,9 +462,9 @@
+   png_set_strip_alpha(png_ptr);
+ 
+   row_data = (png_bytep)png_malloc(png_ptr,
+-    3*height*width*png_sizeof(*row_data));
++    3*height*width*sizeof(*row_data));
+   row_pointers = (png_bytep *)png_malloc(png_ptr,
+-    height*png_sizeof(*row_pointers));
++    height*sizeof(*row_pointers));
+   for(y = 0; y < height; y++) {
+     row_pointers[y] = row_data + y*(3*width);
+   }
diff -Nru libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch
--- libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch	2016-01-23 17:47:51.000000000 +0000
+++ libtheora-1.1.1+dfsg.1/debian/patches/libpng16.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
---- a/examples/png2theora.c
-+++ b/examples/png2theora.c
-@@ -462,9 +462,9 @@
-   png_set_strip_alpha(png_ptr);
- 
-   row_data = (png_bytep)png_malloc(png_ptr,
--    3*height*width*png_sizeof(*row_data));
-+    3*height*width*sizeof(*row_data));
-   row_pointers = (png_bytep *)png_malloc(png_ptr,
--    height*png_sizeof(*row_pointers));
-+    height*sizeof(*row_pointers));
-   for(y = 0; y < height; y++) {
-     row_pointers[y] = row_data + y*(3*width);
-   }
diff -Nru libtheora-1.1.1+dfsg.1/debian/patches/series libtheora-1.1.1+dfsg.1/debian/patches/series
--- libtheora-1.1.1+dfsg.1/debian/patches/series	2016-01-23 17:45:53.000000000 +0000
+++ libtheora-1.1.1+dfsg.1/debian/patches/series	2016-02-07 10:48:12.000000000 +0000
@@ -3,4 +3,4 @@
 0003-Build-on-hurd-i386-and-kfreebsd.patch
 0004-player-example-needs-lm-for-rint.patch
 0005-latex.patch
-libpng16.patch
+0006-libpng16.patch
diff -Nru libtheora-1.1.1+dfsg.1/debian/rules libtheora-1.1.1+dfsg.1/debian/rules
--- libtheora-1.1.1+dfsg.1/debian/rules	2015-09-22 11:59:49.000000000 +0000
+++ libtheora-1.1.1+dfsg.1/debian/rules	2015-12-20 23:44:23.000000000 +0000
@@ -6,9 +6,11 @@
 override_dh_strip:
 	dh_strip --dbg-package=libtheora-dbg
 
-override_dh_install:
+override_dh_install-arch:
 	dh_install
-	for i in debian/libtheora-bin/usr/bin/*; do mv $$i debian/libtheora-bin/usr/bin/theora_`basename $$i`; done
+	for i in debian/libtheora-bin/usr/bin/*; do \
+		mv $$i debian/libtheora-bin/usr/bin/theora_`basename $$i`; \
+	done
 
 override_dh_installdocs:
 	dh_installdocs README AUTHORS