diff -Nru libzstd-1.3.5+dfsg/debian/changelog libzstd-1.3.5+dfsg/debian/changelog
--- libzstd-1.3.5+dfsg/debian/changelog	2018-10-12 08:00:27.000000000 +0000
+++ libzstd-1.3.5+dfsg/debian/changelog	2018-12-31 10:03:56.000000000 +0000
@@ -1,3 +1,13 @@
+libzstd (1.3.5+dfsg-2+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.3.3+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Jan 2018 16:35:02 +0000]
+  * Disable testsuite.
+
+  [changes introduced in 1.3.5+dfsg-2+rpi1 by Peter Michael Green]
+  * Remove .gitattributes file, it seems to break dgit.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 31 Dec 2018 10:03:56 +0000
+
 libzstd (1.3.5+dfsg-2) unstable; urgency=medium
 
   * Add udeb package for libzstd1, Closes: #908834
diff -Nru libzstd-1.3.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch libzstd-1.3.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch
--- libzstd-1.3.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch	1970-01-01 00:00:00.000000000 +0000
+++ libzstd-1.3.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch	2018-12-31 10:03:56.000000000 +0000
@@ -0,0 +1,35 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Mon, 31 Dec 2018 10:31:58 +0000
+X-Dgit-Generated: 1.3.5+dfsg-2+rpi1 c1713c5e804a7b379e38c88ebade8d13bf8e8e2a
+Subject: Remove .gitattributes file, it seems to break dgit.
+
+
+---
+
+--- libzstd-1.3.5+dfsg.orig/.gitattributes
++++ /dev/null
+@@ -1,24 +0,0 @@
+-# Set the default behavior
+-* text eol=lf
+-
+-# Explicitly declare source files
+-*.c text eol=lf
+-*.h text eol=lf
+-
+-# Denote files that should not be modified.
+-*.odt binary
+-*.png binary
+-
+-# Visual Studio
+-*.sln text eol=crlf
+-*.vcxproj* text eol=crlf
+-*.vcproj* text eol=crlf
+-*.suo binary
+-*.rc text eol=crlf
+-
+-# Windows
+-*.bat text eol=crlf
+-*.cmd text eol=crlf
+-
+-# .travis.yml merging
+-.travis.yml merge=ours
diff -Nru libzstd-1.3.5+dfsg/debian/patches/series libzstd-1.3.5+dfsg/debian/patches/series
--- libzstd-1.3.5+dfsg/debian/patches/series	2018-10-12 08:00:27.000000000 +0000
+++ libzstd-1.3.5+dfsg/debian/patches/series	2018-12-31 10:03:56.000000000 +0000
@@ -3,3 +3,4 @@
 0008-Address-embedded-zlib.patch
 0013-skip-memory-greedy-tests.patch
 0014-Reproducible-build.patch
+remove-.gitattributes-file-it-seems-to-b.patch
diff -Nru libzstd-1.3.5+dfsg/debian/rules libzstd-1.3.5+dfsg/debian/rules
--- libzstd-1.3.5+dfsg/debian/rules	2018-10-12 08:00:27.000000000 +0000
+++ libzstd-1.3.5+dfsg/debian/rules	2018-12-31 10:03:56.000000000 +0000
@@ -48,3 +48,6 @@
 	mkdir -p $(mandir)
 	$(HELP2MAN) --name='parallelised Zstandard compression, al la pigz' contrib/pzstd/pzstd \
 	| perl -pe 's/(\(de\)compression\s\(default:)(\d+)(\))/$$1 All$$3/g' >$(mandir)/pzstd.1
+
+override_dh_auto_test:
+	echo testsuite disabled