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