diff -Nru jtreg-4.2-b13/debian/changelog jtreg-4.2-b13/debian/changelog
--- jtreg-4.2-b13/debian/changelog	2018-08-02 04:16:44.000000000 -0300
+++ jtreg-4.2-b13/debian/changelog	2018-11-01 02:36:28.000000000 -0300
@@ -1,3 +1,9 @@
+jtreg (4.2-b13-1ubuntu1) cosmic; urgency=medium
+
+  * Use release instead of source/target. (Closes: #913853, LP: #1803628)
+
+ -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>  Thu, 01 Nov 2018 05:36:28 +0000
+
 jtreg (4.2-b13-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru jtreg-4.2-b13/debian/control jtreg-4.2-b13/debian/control
--- jtreg-4.2-b13/debian/control	2018-08-02 04:06:17.000000000 -0300
+++ jtreg-4.2-b13/debian/control	2018-11-01 02:36:28.000000000 -0300
@@ -1,7 +1,8 @@
 Source: jtreg
 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: Guillaume Mazoyer <respawneral@gmail.com>
 Build-Depends: debhelper (>= 11~), javahelper, help2man
 Build-Depends-Indep: default-jdk,
diff -Nru jtreg-4.2-b13/debian/patches/series jtreg-4.2-b13/debian/patches/series
--- jtreg-4.2-b13/debian/patches/series	2018-08-02 04:06:17.000000000 -0300
+++ jtreg-4.2-b13/debian/patches/series	2018-11-01 02:35:53.000000000 -0300
@@ -1,2 +1,3 @@
 launchers.patch
 add-jcommander-to-classpath.patch
+use-release-instead-of-source-target.patch
diff -Nru jtreg-4.2-b13/debian/patches/use-release-instead-of-source-target.patch jtreg-4.2-b13/debian/patches/use-release-instead-of-source-target.patch
--- jtreg-4.2-b13/debian/patches/use-release-instead-of-source-target.patch	1969-12-31 21:00:00.000000000 -0300
+++ jtreg-4.2-b13/debian/patches/use-release-instead-of-source-target.patch	2018-11-01 02:36:28.000000000 -0300
@@ -0,0 +1,22 @@
+Description: use 'release' instead of 'target' and 'source'
+ When running jtreg with openjdk-8 and the agentvm it will fail to run with
+ "java.lang.NoSuchMethodError: java.nio.ByteBuffer.flip()Ljava/nio/ByteBuffer".
+ An easy fix is to replace "source=1.7 target=1.7" with "release=7" in the
+ ant build script.
+Author: Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/913853
+Bug-Ubuntu: https://launchpad.net/bugs/1803628
+Last-Update: 2018-11-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -172,7 +172,7 @@
+ 
+     <target name="-compile-jtreg.classes">
+         <mkdir dir="${build.classes.dir}"/>
+-        <javac encoding="iso-8859-1" source="1.7" target="1.7"
++        <javac encoding="iso-8859-1" release="7"
+             debug="true" debuglevel="source,lines"
+             srcdir="${src.classes.dir}"
+             destdir="${build.classes.dir}"