diff -Nru libcec-4.0.1+dfsg1/debian/changelog libcec-4.0.1+dfsg1/debian/changelog
--- libcec-4.0.1+dfsg1/debian/changelog	2017-01-18 08:16:30.000000000 +0000
+++ libcec-4.0.1+dfsg1/debian/changelog	2017-02-02 15:11:26.000000000 +0000
@@ -1,3 +1,11 @@
+libcec (4.0.1+dfsg1-1+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 3.1.0+dfsg1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 10 Mar 2016 00:53:26 +0000]
+  * Add symbols file hack for raspbian.
+  * Fix clean target.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 02 Feb 2017 15:11:26 +0000
+
 libcec (4.0.1+dfsg1-1) unstable; urgency=medium
 
   * Update symbols file
diff -Nru libcec-4.0.1+dfsg1/debian/rules libcec-4.0.1+dfsg1/debian/rules
--- libcec-4.0.1+dfsg1/debian/rules	2017-01-18 08:16:30.000000000 +0000
+++ libcec-4.0.1+dfsg1/debian/rules	2017-02-02 15:11:26.000000000 +0000
@@ -8,6 +8,7 @@
 	dh  $@ --with python2
 
 override_dh_auto_configure:
+	sed -i 's/(arch=!armel)/(optional=raspbian)/' debian/libcec*.symbols
 	ln -s /usr/include/cec-platform include/platform && \
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
@@ -16,3 +17,13 @@
 	mv debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	rm debian/tmp/usr/bin/cec-client
 	mv debian/tmp/usr/bin/cec-client-* debian/tmp/usr/bin/cec-client
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f include/platform
+	rm -f include/version.h
+	rm -f src/cec-client/env.h
+	rm -f src/cecc-client/env.h
+	rm -f src/libcec/env.h
+	rm -f src/libcec/libcec.pc
+	sed -i 's/(optional=raspbian)/(arch=!armel)/' debian/libcec*.symbols