diff -Nru jtreg-5.0-b01/debian/changelog jtreg-5.0-b01/debian/changelog
--- jtreg-5.0-b01/debian/changelog	2020-04-12 22:28:39.000000000 +0000
+++ jtreg-5.0-b01/debian/changelog	2020-04-13 14:55:44.000000000 +0000
@@ -1,3 +1,9 @@
+jtreg (5.0-b01-2ubuntu1) focal; urgency=medium
+
+  * Make a better JT_HOME.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 13 Apr 2020 16:55:44 +0200
+
 jtreg (5.0-b01-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru jtreg-5.0-b01/debian/control jtreg-5.0-b01/debian/control
--- jtreg-5.0-b01/debian/control	2020-04-04 22:45:09.000000000 +0000
+++ jtreg-5.0-b01/debian/control	2020-04-13 14:55:44.000000000 +0000
@@ -12,6 +12,7 @@
  javahelper,
  libjtharness-java (>= 6.0),
  libxalan2-java,
+ libhamcrest-java,
  testng
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/java-team/jtreg.git
@@ -25,6 +26,7 @@
  ${misc:Depends},
  javahelp2,
  libjtharness-java (>= 6.0),
+ libhamcrest-java,
  libxalan2-java
 Recommends: testng
 Description: Regression Test Harness for the OpenJDK platform
diff -Nru jtreg-5.0-b01/debian/jtreg.links jtreg-5.0-b01/debian/jtreg.links
--- jtreg-5.0-b01/debian/jtreg.links	2020-04-12 19:18:26.000000000 +0000
+++ jtreg-5.0-b01/debian/jtreg.links	2020-04-13 14:55:44.000000000 +0000
@@ -1,8 +1,10 @@
 usr/share/jtreg/bin/jtreg               /usr/bin/jtreg
 usr/share/jtreg/bin/jtdiff              /usr/bin/jtdiff
 
-usr/share/java/javatest.jar             /usr/share/jtreg/lib/javatest.jar
-usr/share/java/jcommander.jar           /usr/share/jtreg/lib/jcommander.jar
-usr/share/java/jtreg.jar                /usr/share/jtreg/lib/jtreg.jar
-usr/share/java/junit4.jar               /usr/share/jtreg/lib/junit.jar
-usr/share/java/testng.jar               /usr/share/jtreg/lib/testng.jar
+usr/share/java/hamcrest-core.jar        /usr/share/jtreg/share/java/hamcrest-core.jar
+usr/share/java/javatest.jar             /usr/share/jtreg/share/java/javatest.jar
+usr/share/java/jcommander.jar           /usr/share/jtreg/share/java/jcommander.jar
+usr/share/java/jh.jar                   /usr/share/jtreg/share/java/jh.jar
+usr/share/java/jtreg.jar                /usr/share/jtreg/share/java/jtreg.jar
+usr/share/java/junit4.jar               /usr/share/jtreg/share/java/junit.jar
+usr/share/java/testng.jar               /usr/share/jtreg/share/java/testng.jar