diff -Nru ha-jdbc-2.0.16+rc1/debian/changelog ha-jdbc-2.0.16+rc1/debian/changelog
--- ha-jdbc-2.0.16+rc1/debian/changelog	2012-06-21 11:28:00.000000000 +0000
+++ ha-jdbc-2.0.16+rc1/debian/changelog	2016-06-21 12:12:38.000000000 +0000
@@ -1,3 +1,17 @@
+ha-jdbc (2.0.16+rc1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1 (Closes: #801010)
+  * debian/control:
+    - Standards-Version updated to 3.9.8
+    - Updated the Homepage field
+    - Added the Vcs-* fields
+    - Changed the priority from extra to optional
+  * Added a watch file tracking the GitHub tags
+  * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 21 Jun 2016 14:12:36 +0200
+
 ha-jdbc (2.0.16+rc1-2) unstable; urgency=low
 
   * Team upload.
diff -Nru ha-jdbc-2.0.16+rc1/debian/compat ha-jdbc-2.0.16+rc1/debian/compat
--- ha-jdbc-2.0.16+rc1/debian/compat	2011-12-21 22:24:27.000000000 +0000
+++ ha-jdbc-2.0.16+rc1/debian/compat	2016-06-21 12:11:39.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru ha-jdbc-2.0.16+rc1/debian/control ha-jdbc-2.0.16+rc1/debian/control
--- ha-jdbc-2.0.16+rc1/debian/control	2012-06-21 11:27:22.000000000 +0000
+++ ha-jdbc-2.0.16+rc1/debian/control	2016-06-21 12:11:46.000000000 +0000
@@ -1,20 +1,28 @@
 Source: ha-jdbc
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Brian Thomason <brian.thomason@eucalyptus.com>
-Build-Depends: debhelper (>= 8), libservlet2.5-java, libjibx1.2-java,
-               libbcel-java, libquartz-java, libjgroups-java, libslf4j-java,
-               ant, default-jdk
-Standards-Version: 3.9.2
-Homepage: http://ha-jdbc.sourceforge.net/
+Build-Depends: ant,
+               debhelper (>= 9),
+               default-jdk,
+               libbcel-java,
+               libjgroups-java,
+               libjibx1.2-java,
+               libquartz-java,
+               libservlet3.1-java,
+               libslf4j-java
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/ha-jdbc.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/ha-jdbc.git
+Homepage: http://ha-jdbc.github.io
 
 Package: libha-jdbc-java
 Architecture: all
-Depends: ${misc:Depends}, libslf4j-java
+Depends: libslf4j-java, ${misc:Depends}
 Description: JDBC proxy that provides clustering capability to any JDBC driver
  HA-JDBC is a JDBC proxy that provides light-weight, transparent, fault
- tolerant clustering capability to any underlying JDBC driver. 
+ tolerant clustering capability to any underlying JDBC driver.
  .
  Features include:
  .
diff -Nru ha-jdbc-2.0.16+rc1/debian/copyright ha-jdbc-2.0.16+rc1/debian/copyright
--- ha-jdbc-2.0.16+rc1/debian/copyright	2011-12-21 22:24:27.000000000 +0000
+++ ha-jdbc-2.0.16+rc1/debian/copyright	2016-06-21 11:56:04.000000000 +0000
@@ -3,7 +3,7 @@
 Source: http://sourceforge.net/projects/ha-jdbc/files/HA-JDBC 2.0 _ Stable/2.0.16-rc-1/ha-jdbc-2.0.16-rc-1-src.tar.gz/download
 
 Files: *
-Copyright: 
+Copyright:
 License: LGPL-2.1
   On Debian GNU/Linux system you can find the complete text of the
   LGPL-2.1 license in '/usr/share/common-licenses/LGPL-2.1'
diff -Nru ha-jdbc-2.0.16+rc1/debian/patches/modify-build-file.diff ha-jdbc-2.0.16+rc1/debian/patches/modify-build-file.diff
--- ha-jdbc-2.0.16+rc1/debian/patches/modify-build-file.diff	2011-12-21 22:24:27.000000000 +0000
+++ ha-jdbc-2.0.16+rc1/debian/patches/modify-build-file.diff	2016-06-21 12:09:43.000000000 +0000
@@ -44,7 +44,7 @@
  		<fileset dir="${lib.compile.dir}" includes="*.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="jibx-run-1.2.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="jibx-bind-1.2.jar"></fileset>
-+		<fileset dir="/usr/share/java" includes="servlet-api-2.5.jar"></fileset>
++		<fileset dir="/usr/share/java" includes="servlet-api-3.1.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="bcel.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="jgroups.jar"></fileset>
 +		<fileset dir="/usr/share/java" includes="quartz.jar"></fileset>
diff -Nru ha-jdbc-2.0.16+rc1/debian/watch ha-jdbc-2.0.16+rc1/debian/watch
--- ha-jdbc-2.0.16+rc1/debian/watch	1970-01-01 00:00:00.000000000 +0000
+++ ha-jdbc-2.0.16+rc1/debian/watch	2016-06-21 12:09:43.000000000 +0000
@@ -0,0 +1,2 @@
+version=3
+https://github.com/ha-jdbc/ha-jdbc/tags .*/archive/([\d\.]+).tar.gz