diff --git a/debian/changelog b/debian/changelog
index d9e54dc44..d8975a323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ cmake (2.8.2-3) UNRELEASED; urgency=low
   * debian/control: Bumped Standards-Version to 3.9.1, no further changes
     needed.
   * debian/source/local-options: Added "unapply-patches".
+  * debian/watch: Added git-import-orig invocation.
+  * debian/gbp.conf: Added, to ensure we use pristine-tar.
 
  -- Kai Wasserbäch <debian@carbon-project.org>  Tue, 13 Jul 2010 16:51:22 +0200
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000000000..cec628c74
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/watch b/debian/watch
index 94635edbb..dab9ba1a9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,4 +3,5 @@ version=3
 # Track CMake 2.6.x releases including RCs
 opts="uversionmangle=s/-[Rr][Cc]-?(\d+)/~rc$1/i" \
     http://www.cmake.org/files/v([\d.]+)/ \
-    cmake-([\d.]+(?i:-RC-?\d+)?).tar.gz
+    cmake-([\d.]+(?i:-RC-?\d+)?).tar.gz \
+    debian git-import-orig