diff --git a/debian/changelog b/debian/changelog
index e85609a..2f099cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-commons-vfs (2.1-1) UNRELEASED; urgency=medium
+commons-vfs (2.1-1) unstable; urgency=medium
 
+  * Team upload.
   * New upstream release
     - Refreshed the patches
     - Disabled the new HDFS provider (missing dependencies)
@@ -8,7 +9,7 @@
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
 
- -- Emmanuel Bourg <ebourg@apache.org>  Tue, 05 Jul 2016 00:36:26 +0200
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 07 Jul 2016 01:09:47 +0200
 
 commons-vfs (2.0-7) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 828ff1a..83c44c7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,21 +2,13 @@
 Upstream-Name: Apache Commons VFS
 Upstream-Contact: http://commons.apache.org/vfs/
 Source: http://www.apache.org/dist/commons/vfs/
-Comment:
-    Upstream Authors: Adam Murdoch <adammurdoch@apache.org>
-                  James Strachan <jstrachan@apache.org>
-                  Mario Ivankovits <imario@apache.org>
-                  Rahul Akolkar <rahul@apache.org>
-                  Rami Ojares <rami.ojares@elisa.fi>
-                  Anthony Goubard <adagoubard@chello.nl>
-                  Christopher Ottley <xknight@users.sourceforge.net>
 
 Files: *
-Copyright: Copyright 2002-2011 The Apache Software Foundation
+Copyright: 2002-2016, The Apache Software Foundation
 License: Apache-2.0
 
 Files: debian/*
-Copyright: Copyright (C) 2008-2011, Damien Raude-Morvan <drazzib@drazzib.com>
+Copyright: 2008-2012, Damien Raude-Morvan <drazzib@drazzib.com>
 License: Apache-2.0
 
 License: Apache-2.0
diff --git a/debian/libcommons-vfs-java.poms b/debian/libcommons-vfs-java.poms
index f75bf6a..a99fd61 100644
--- a/debian/libcommons-vfs-java.poms
+++ b/debian/libcommons-vfs-java.poms
@@ -1,3 +1,30 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
 pom.xml
 examples/pom.xml --ignore
 core/pom.xml --java-lib