diff --git a/debian/gbp.conf b/debian/gbp.conf
index 213ea5b..1c45620 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,9 @@
+[DEFAULT]
+pristine-tar = True
+
 [buildpackage]
 upstream-tree = tag
-upstream-tag = %(version)s
+upstream-tag = upstream/%(version)s
 upstream-branch = upstream
 debian-branch = master
 submodules = true