diff --git a/debian/changelog b/debian/changelog
index 775f104..67b8e04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,23 @@
+fontchooser (1.0.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * wrap-and-sort -sa.
+  * Use compat level 9.
+  * Remove versioned constraints on javahelper dependency.
+  * Declare compliance with Debian Policy 3.9.8.
+  * Vcs-fields: Use canonical URLs.
+  * Update homepage field because the old address does not deal
+    with fontchooser anymore.
+  * Use only Build-Depends field.
+  * Fix Lintian warning description-synopsis-starts-with-article.
+  * Override Lintian error libfontchooser-java: helper-templates-in-copyright
+    because the copyright is accurate.
+
+ -- Markus Koschany <apo@debian.org>  Mon, 02 May 2016 18:04:11 +0200
+
 fontchooser (1.0.0-1) unstable; urgency=low
 
-  * Initial release of FontChooser package. Source is repackaged from 
+  * Initial release of FontChooser package. Source is repackaged from
     upstream, using jh_repack. (Closes: #603074)
 
  -- Andrew Ross <ubuntu@rossfamily.co.uk>  Wed, 10 Nov 2010 19:15:14 +0000
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index cf38e1e..09fe627 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,40 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Andrew Ross <ubuntu@rossfamily.co.uk>
-Build-Depends: debhelper (>= 7), javahelper (>=0.25) 
-Build-Depends-Indep: default-jdk, default-jdk-doc, ant
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/fontchooser
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/fontchooser/
-Homepage: http://www.connectina.com/components/fontchooser.html
+Uploaders:
+ Andrew Ross <ubuntu@rossfamily.co.uk>
+Build-Depends:
+ ant,
+ debhelper (>= 9),
+ default-jdk,
+ default-jdk-doc,
+ javahelper
+Standards-Version: 3.9.8
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/fontchooser
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/fontchooser/
+Homepage: https://tracker.debian.org/pkg/fontchooser
 
 Package: libfontchooser-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
-Description: A Java control to allow font selection
- Provides a pane of controls designed to allow a user to 
+Depends:
+ ${java:Depends},
+ ${misc:Depends}
+Recommends:
+ ${java:Recommends}
+Description: Java control to allow font selection
+ Provides a pane of controls designed to allow a user to
  select a font.
 
 Package: libfontchooser-java-doc
 Section: doc
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
-Description: A Java control to allow font selection (documentation)
+Depends:
+ ${java:Depends},
+ ${misc:Depends}
+Recommends:
+ ${java:Recommends}
+Description: Java control to allow font selection (documentation)
  Provides a pane of controls designed to allow a user to
  select a font.
  .
  This package contains the documentation.
-
diff --git a/debian/copyright b/debian/copyright
index c3c4cd8..ac741f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,6 +24,5 @@
 
     Copyright (C) 2010 Andrew Ross <ubuntu@rossfamily.co.uk>
 
-and is licensed under the GPL version 3, 
+and is licensed under the GPL version 3,
 see `/usr/share/common-licenses/GPL-3'.
-
diff --git a/debian/libfontchooser-java.lintian-overrides b/debian/libfontchooser-java.lintian-overrides
new file mode 100644
index 0000000..62204e1
--- /dev/null
+++ b/debian/libfontchooser-java.lintian-overrides
@@ -0,0 +1,2 @@
+# Copyright looks good to me
+libfontchooser-java: helper-templates-in-copyright
diff --git a/debian/rules b/debian/rules
index 607a938..d100aa8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-JAVA_HOME               := /usr/lib/jvm/default-java
+export JAVA_HOME := /usr/lib/jvm/default-java
 
 %:
 	dh $@ --with javahelper
-
-#DEB_ANT_BUILDFILE       := build.xml
-#DEB_ANT_BUILD_TARGET    := clean jar
-
-#install/libfontchooser-java::
-#	install -m 644 -D dist/FontChooser.jar $(DEB_DESTDIR)/usr/share/java/FontChooser-$(DEB_UPSTREAM_VERSION).jar
-#	dh_link /usr/share/java/FontChooser-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/FontChooser.jar
 
 # Get original source, and remove some bits
 get-orig-source: