diff --git a/debian/changelog b/debian/changelog
index ef01fa8..ea339eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jtreg6 (6.1+2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed debian/orig-tar.sh and updated the watch file
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 15 Mar 2023 10:17:35 +0100
+
 jtreg6 (6.1+2-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 2514bc4..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-VERSION=$2
-DIR=jtreg-${VERSION}
-TAR=../jtreg_${VERSION}.orig.tar.gz
-
-rm -f $3
-wget http://hg.openjdk.java.net/code-tools/jtreg/archive/jtreg$VERSION.tar.gz
-mv jtreg$VERSION.tar.gz $TAR
-
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi
-
-exit 0
diff --git a/debian/watch b/debian/watch
index 35febe5..2872b82 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=4
-https://github.com/openjdk/jtreg/tags .*/jtreg([\d\.]+(?:-b[0-9]+)?).tar.gz debian debian/orig-tar.sh
+opts="mode=git" \
+https://github.com/openjdk/jtreg refs/tags/jtreg-?([\d\.\+]+(?:-b[0-9]+)?)