diff -Nru task-2.5.1+dfsg/debian/changelog task-2.5.1+dfsg/debian/changelog
--- task-2.5.1+dfsg/debian/changelog	2016-04-04 06:23:59.000000000 +0000
+++ task-2.5.1+dfsg/debian/changelog	2016-12-13 14:40:01.000000000 +0000
@@ -1,3 +1,16 @@
+task (2.5.1+dfsg-2) unstable; urgency=medium
+
+  [ Gordon Ball ]
+  * Fix python dependency for tests
+  * Use the installed binary for tests
+
+  [ Sebastien Badia ]
+  * Updated SV to 3.9.8, no changes required
+  * Set maintainer to tasktools team
+  * Update my email to the Debian one
+
+ -- Gordon Ball <gordon@chronitis.net>  Tue, 13 Dec 2016 15:40:01 +0100
+
 task (2.5.1+dfsg-1) unstable; urgency=medium
 
   [ Gordon Ball ]
diff -Nru task-2.5.1+dfsg/debian/control task-2.5.1+dfsg/debian/control
--- task-2.5.1+dfsg/debian/control	2016-04-03 10:47:06.000000000 +0000
+++ task-2.5.1+dfsg/debian/control	2016-12-13 14:24:50.000000000 +0000
@@ -1,8 +1,8 @@
 Source: task
 Section: utils
 Priority: optional
-Maintainer: Sebastien Badia <seb@sebian.fr>
-Uploaders: Gordon Ball <gordon@chronitis.net>
+Maintainer: Debian Tasktools Packaging Team <pkg-tasktools-discuss@lists.alioth.debian.org>
+Uploaders: Gordon Ball <gordon@chronitis.net>, Sebastien Badia <sbadia@debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
                dh-buildinfo,
@@ -12,10 +12,10 @@
                libreadline-dev,
                python,
                uuid-dev
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: https://taskwarrior.org
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/task.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/task.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-tasktools/task.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-tasktools/task.git
 
 Package: taskwarrior
 Architecture: any
diff -Nru task-2.5.1+dfsg/debian/tests/control task-2.5.1+dfsg/debian/tests/control
--- task-2.5.1+dfsg/debian/tests/control	2016-04-02 08:07:53.000000000 +0000
+++ task-2.5.1+dfsg/debian/tests/control	2016-09-11 23:19:15.000000000 +0000
@@ -1,5 +1,5 @@
 Tests: taskwarrior
-Depends: taskwarrior, python2.7
+Depends: taskwarrior, python
 
 Tests: adequate-taskwarrior
 Depends: taskwarrior, adequate
diff -Nru task-2.5.1+dfsg/debian/tests/taskwarrior task-2.5.1+dfsg/debian/tests/taskwarrior
--- task-2.5.1+dfsg/debian/tests/taskwarrior	2016-04-02 08:07:53.000000000 +0000
+++ task-2.5.1+dfsg/debian/tests/taskwarrior	2016-09-11 23:19:15.000000000 +0000
@@ -5,11 +5,11 @@
 cd "$ADTTMP"
 mkdir -p home mock src/shell
 ln -sf /bin/false mock/scp
-ln -sf $(which task) src/task
 export HOME="$PWD/home/"
 export PATH="$PWD/mock/:$PATH"
-export TASKDATA="$HOME/taskrc"
-export TASKRC="$HOME/taskdata"
+export TASKRC="$HOME/taskrc"
+export TASKDATA="$HOME/taskdata"
+export TASK_USE_PATH=1
 touch "$TASKRC"
 cd test/
 rm -f version.t # checks git