diff --git a/debian/gbp.conf b/debian/gbp.conf
index 34ac5eb..42eba22 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,8 +1,12 @@
 [DEFAULT]
+debian-branch = debian/main
+debian-tag = debian/%(version)s
+upstream-branch = upstream
+upstream-tag = upstream/%(version)s
 pristine-tar = True
-upstream-branch = master
-# don't hardcode the debian branch
-ignore-branch = True
+
+[dch]
+meta = 1
 
 [import-orig]
-debian-branch = debian
+filter = ['.gitignore']