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