diff --git a/debian/changelog b/debian/changelog
index 3d76b7302b9b8cae3ff4f7d2fe999a3072db013f..d3f97af7fc147908a0398ca4cb85a474e63e4fbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+java-xmlbuilder (0.4-2) unstable; urgency=low
+
+  * Install jar files to /usr/share/java (Closes: #671208):
+    - d/libjava-xmlbuilder-java.poms: Use --java-lib option.
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Updated with field names for released version of DEP-5.
+  * Updated my email address.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 02 May 2012 16:35:02 +0100
+
 java-xmlbuilder (0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #617526).
diff --git a/debian/control b/debian/control
index 35cd56438200bb2f49cdc78f69f7a65d9d912288..347d2c5ad620165263004fc440cb818419b2d520 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: java-xmlbuilder
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: James Page <james.page@canonical.com>
+Uploaders: James Page <james.page@ubuntu.com>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libmaven-javadoc-plugin-java, junit, default-jdk-doc 
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/java-xmlbuilder/
 Vcs-Git: git://git.debian.org/git/pkg-java/java-xmlbuilder.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/java-xmlbuilder.git
diff --git a/debian/copyright b/debian/copyright
index d0a0432efa2ba4250a812d78ea468f93323612aa..78631e2a3376b2ede1efbfaf9c23c2f6f9af6298 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,25 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: java-xmlbuilder
-Maintainer:  James Murty as developer 
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: java-xmlbuilder
+Upstream-Contact:  James Murty as developer 
 Source: http://code.google.com/p/java-xmlbuilder/
 
 Files: *
 Copyright: 2008, James Murty <jmurty@dev.java.net>
 License: Apache-2.0
 
-Files: src/net/iharder/base64/Base64.java
+Files: src/main/java/net/iharder/base64/Base64.java
 Copyright: © 2002-2007 Robert Harder <rob@iharder.net>
-License: Public Domain
+License: public-domain
+ "I am placing this code in the Public Domain. Do with it as you will.
+  This software comes with no guarantees or warranties but with
+  plenty of well-wishing instead!"
 
 Files: debian/*
 Copyright: 2011, Canonical Ltd (http://www.canonical.com)
 License: Apache-2.0
 
 License: Apache-2.0
-  On Debian GNU/Linux system you can find the complete text of the
-  Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
 
 
diff --git a/debian/libjava-xmlbuilder-java.poms b/debian/libjava-xmlbuilder-java.poms
index 31a0ccffdcfb0254ed7bb198884215c614890e4a..6856f179b523a3c61855b4659a974eff25c1a1b8 100644
--- a/debian/libjava-xmlbuilder-java.poms
+++ b/debian/libjava-xmlbuilder-java.poms
@@ -23,4 +23,4 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
 #     temporarily for certain artifacts such as Javadoc jars.
 #
-pom.xml --no-parent --has-package-version
+pom.xml --no-parent --has-package-version --java-lib