diff --git a/debian/changelog b/debian/changelog
index 4f49431..2d45b98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxstream-java (1.3.1-2) experimental; urgency=low
+
+  * Change section to java
+  * Bump up Standards-Version to 3.8.2
+  * Add ${misc:Depends} to Depends to clear Lintian warnings
+  * Remove Depends on Java runtimes as it is a library
+  * Add the Maven POM to the package
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+
+ -- Ludovic Claude <ludovic.claude@laposte.net>  Tue, 28 Jul 2009 20:51:09 +0100
+
 libxstream-java (1.3.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 7208393..4419d74 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,20 @@
 Source: libxstream-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner@debian.org>, Varun Hiremath <varun@debian.org>
 Build-Depends: debhelper (>= 5), cdbs
 Build-Depends-Indep: ant, openjdk-6-jdk, libxom-java, libjoda-time-java,
  libjettison-java, libcglib2.1-java, libdom4j-java, libxpp3-java,
- libjdom1-java
-Standards-Version: 3.8.0
+ libjdom1-java, maven-repo-helper
+Standards-Version: 3.8.2
 Homepage: http://xstream.codehaus.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxstream-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxstream-java
 
 Package: libxstream-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}
 Description: Java library to serialize objects to XML and back again
  The features of the XStream library are:
  .
diff --git a/debian/libxstream-java.poms b/debian/libxstream-java.poms
new file mode 100644
index 0000000..f47c21a
--- /dev/null
+++ b/debian/libxstream-java.poms
@@ -0,0 +1,4 @@
+pom.xml --no-parent
+xstream/pom.xml
+xstream-benchmark/pom.xml
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8577380
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/
diff --git a/debian/rules b/debian/rules
index e55936d..a28d913 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,21 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILDFILE    := xstream/build.xml
 DEB_ANT_BUILD_TARGET := benchmark:compile jar
-DEB_JARS             := xom joda-time jettison cglib dom4j xpp3 jdom1
+DEB_JARS             := ant-nodeps xom joda-time jettison cglib dom4j xpp3 jdom1
 ANT_OPTS	     := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
 
-install/libxstream-java:: 
-	install -m644 -D xstream/target/xstream-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibxstream-java /usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream.jar
-	install -m644 -D xstream/target/xstream-benchmark-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibxstream-java /usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream-benchmark.jar
+binary-post-install/$(PACKAGE)::
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l xstream/pom.xml xstream/target/xstream-SNAPSHOT.jar
+	mh_installjar -p$(PACKAGE) -l xstream-benchmark/pom.xml xstream/target/xstream-benchmark-SNAPSHOT.jar
+
+clean::
+	-rm -rf debian/tmp
 
 get-orig-source:
 	uscan --force-download --rename