diff -Nru javahelp2-2.0.05.ds1/debian/changelog javahelp2-2.0.05.ds1/debian/changelog
--- javahelp2-2.0.05.ds1/debian/changelog	2015-03-02 09:01:01.000000000 +0000
+++ javahelp2-2.0.05.ds1/debian/changelog	2016-06-03 12:19:36.000000000 +0000
@@ -1,3 +1,12 @@
+javahelp2 (2.0.05.ds1-9) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to the Servlet API 3.1
+  * Standards-Version updated to 3.9.8 (no changes)
+  * Use secure Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 03 Jun 2016 14:19:34 +0200
+
 javahelp2 (2.0.05.ds1-8) unstable; urgency=medium
 
   * Team upload.
diff -Nru javahelp2-2.0.05.ds1/debian/control javahelp2-2.0.05.ds1/debian/control
--- javahelp2-2.0.05.ds1/debian/control	2015-03-02 08:49:01.000000000 +0000
+++ javahelp2-2.0.05.ds1/debian/control	2016-06-03 12:11:03.000000000 +0000
@@ -4,10 +4,10 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Marek Slama <marek.slama@sun.com>, Varun Hiremath <varun@debian.org>
 Build-Depends: cdbs, debhelper (>= 9), maven-repo-helper
-Build-Depends-Indep: ant-optional, default-jdk, libservlet3.0-java, imagemagick
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/javahelp2.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/javahelp2.git
+Build-Depends-Indep: ant-optional, default-jdk, libservlet3.1-java, imagemagick
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/javahelp2.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/javahelp2.git
 Homepage: http://javahelp.java.net
 
 Package: javahelp2
diff -Nru javahelp2-2.0.05.ds1/debian/rules javahelp2-2.0.05.ds1/debian/rules
--- javahelp2-2.0.05.ds1/debian/rules	2015-03-02 08:56:47.000000000 +0000
+++ javahelp2-2.0.05.ds1/debian/rules	2016-06-03 12:08:46.000000000 +0000
@@ -25,8 +25,8 @@
 stamp-build-$(p_jh):
 	#Create symlink to required jars
 	mkdir -p $(DEB_SRCDIR)/javahelp_nbproject/lib
-	ln -s -f /usr/share/java/servlet-api-3.0.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar
-	ln -s -f /usr/share/java/jsp-api-2.2.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jsp-api.jar
+	ln -s -f /usr/share/java/servlet-api-3.1.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar
+	ln -s -f /usr/share/java/jsp-api-2.3.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jsp-api.jar
 	#Remove class uncompilable without JDIC
 	rm -f $(DEB_SRCDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
 	#Build javahelp target 'release' is for jars, target 'javadoc' is for javadoc