diff -Nru jsch-agent-proxy-0.0.8/debian/build.xml jsch-agent-proxy-0.0.8/debian/build.xml
--- jsch-agent-proxy-0.0.8/debian/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ jsch-agent-proxy-0.0.8/debian/build.xml	2016-02-17 15:00:45.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<project name="jsch.agent" default="build-all" basedir=".">
+    <property name="build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+    <target name="build-all">
+        <antcall target="component">
+            <param name="component" value="."/>
+            <param name="target" value="package"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-core"/>
+            <param name="target" value="package"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-jsch"/>
+            <param name="target" value="package"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-pageant"/>
+            <param name="target" value="package"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-sshagent"/>
+            <param name="target" value="package"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-usocket-jna"/>
+            <param name="target" value="package"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-usocket-nc"/>
+            <param name="target" value="package"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-connector-factory"/>
+            <param name="target" value="package"/>
+        </antcall>
+    </target>
+
+    <target name="clean">
+        <antcall target="component">
+            <param name="component" value="."/>
+            <param name="target" value="clean"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-core"/>
+            <param name="target" value="clean"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-jsch"/>
+            <param name="target" value="clean"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-pageant"/>
+            <param name="target" value="clean"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-sshagent"/>
+            <param name="target" value="clean"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-usocket-jna"/>
+            <param name="target" value="clean"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-usocket-nc"/>
+            <param name="target" value="clean"/>
+        </antcall>
+        <antcall target="component">
+            <param name="component" value="jsch-agent-proxy-connector-factory"/>
+            <param name="target" value="clean"/>
+        </antcall>
+    </target>
+
+    <target name="component">
+        <!-- Ensure any jar files already built in this project are used for compilation -->
+        <path id="local.path.ref">
+            <fileset dir="${basedir}" includes="**/*.jar"/>
+        </path>
+        <ant antfile="${build.xml}" dir="${basedir}/${component}" target="${target}">
+            <property name="package" value="${package}"/>
+            <property name="version" value="${version}"/>
+            <property name="debian.dir" value="${basedir}/debian"/>
+            <property name="classpath.compile" value="${toString:local.path.ref}"/>
+        </ant>
+    </target>
+</project>
diff -Nru jsch-agent-proxy-0.0.8/debian/changelog jsch-agent-proxy-0.0.8/debian/changelog
--- jsch-agent-proxy-0.0.8/debian/changelog	2015-09-02 21:33:27.000000000 +0000
+++ jsch-agent-proxy-0.0.8/debian/changelog	2016-02-17 15:00:57.000000000 +0000
@@ -1,3 +1,14 @@
+jsch-agent-proxy (0.0.8-2ubuntu1) xenial; urgency=medium
+
+  * Switch to using maven-ant-helper to avoid maven in main:
+    - d/rules,modules: Switch maven->ant; add targets for jar installs
+    - d/build.xml: Wrapper for maven-ant-helper build.xml to support
+      multi-module projects.
+    - d/control: Update BD's to drop maven related dependencies, add
+      maven-ant-helper and maven-repo-helper.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 17 Feb 2016 15:00:47 +0000
+
 jsch-agent-proxy (0.0.8-2) unstable; urgency=medium
 
   * Moved libjna-platform-java to the required dependencies.
diff -Nru jsch-agent-proxy-0.0.8/debian/control jsch-agent-proxy-0.0.8/debian/control
--- jsch-agent-proxy-0.0.8/debian/control	2015-09-02 21:32:39.000000000 +0000
+++ jsch-agent-proxy-0.0.8/debian/control	2016-02-17 12:24:13.000000000 +0000
@@ -1,10 +1,11 @@
 Source: jsch-agent-proxy
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5), libjna-platform-java
-Build-Depends-Indep: libmaven-bundle-plugin-java, libjsch-java
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-ant-helper, maven-repo-helper, libjna-platform-java, ant, ant-optional
+Build-Depends-Indep: libjsch-java
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/jsch-agent-proxy.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jsch-agent-proxy.git
diff -Nru jsch-agent-proxy-0.0.8/debian/modules jsch-agent-proxy-0.0.8/debian/modules
--- jsch-agent-proxy-0.0.8/debian/modules	1970-01-01 00:00:00.000000000 +0000
+++ jsch-agent-proxy-0.0.8/debian/modules	2016-02-17 14:33:12.000000000 +0000
@@ -0,0 +1,7 @@
+jsch-agent-proxy-core
+jsch-agent-proxy-jsch
+jsch-agent-proxy-pageant
+jsch-agent-proxy-sshagent
+jsch-agent-proxy-usocket-jna
+jsch-agent-proxy-usocket-nc
+jsch-agent-proxy-connector-factory
diff -Nru jsch-agent-proxy-0.0.8/debian/rules jsch-agent-proxy-0.0.8/debian/rules
--- jsch-agent-proxy-0.0.8/debian/rules	2015-06-15 21:17:13.000000000 +0000
+++ jsch-agent-proxy-0.0.8/debian/rules	2016-02-17 14:52:10.000000000 +0000
@@ -1,10 +1,21 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
+PACKAGE           := $(DEB_SOURCE_PACKAGE)
+VERSION           := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME		  := /usr/lib/jvm/default-java
+DEB_JARS          := ant-nodeps ant-junit jsch jna-platform jna
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS      := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	set -e; \
+	for module in `cat debian/modules`; do \
+		 jar=`echo $$module | sed -e "s/jsch-agent-proxy-/jsch.agentproxy./g"`; \
+		 mh_installjar -plib$(PACKAGE)-java -l $$module/pom.xml $$module/build/$$jar-$(VERSION).jar; \
+	done
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename