diff --git a/debian/gbp.conf b/debian/gbp.conf
index ead668a..7a9f00a 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,3 +2,7 @@
 debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
+
+[import-orig]
+# Use git cherrypick -n upstream instead.
+merge = False