diff --git a/tools/check-versions b/tools/check-versions
index ebca2d7..d1d52d9 100755
--- a/tools/check-versions
+++ b/tools/check-versions
@@ -219,7 +219,11 @@ add_component(:hg, 'https://www.mercurial-scm.org/repo/hg', checkout_fix: hg_che
 hggit_checkout_fix = lambda do |version|
   return unless check_version(version, '0.8.0')
 
-  run_cmd %W[hg import -q --no-commit #{__dir__}/hggit_rename_fix_0.8.0.patch], fatal: false
+  if check_version(version, '0.9.0')
+    run_cmd %W[hg import -q --no-commit #{__dir__}/hggit_rename_fix_0.9.0.patch], fatal: false
+  else
+    run_cmd %W[hg import -q --no-commit #{__dir__}/hggit_rename_fix_0.8.0.patch], fatal: false
+  end
 end
 
 add_component(:hggit, 'https://foss.heptapod.net/mercurial/hg-git', checkout_fix: hggit_checkout_fix)
diff --git a/tools/hggit_rename_fix_0.9.0.patch b/tools/hggit_rename_fix_0.9.0.patch
new file mode 100644
index 0000000..fd4a206
--- /dev/null
+++ b/tools/hggit_rename_fix_0.9.0.patch
@@ -0,0 +1,22 @@
+diff --git a/hggit/git_handler.py b/hggit/git_handler.py
+--- a/hggit/git_handler.py
++++ b/hggit/git_handler.py
+@@ -829,6 +829,8 @@
+     def import_git_commit(self, commit):
+         self.ui.debug(_(b"importing: %s\n") % commit.id)
+ 
++        extra_in_message = self.ui.configbool(b'git', b'debugextrainmessage', False)
++
+         detect_renames = False
+         (strip_message, hg_renames,
+          hg_branch, extra) = git2hg.extract_hg_metadata(
+@@ -839,7 +841,8 @@
+             # renames detected from Git. This is because we export an extra
+             # 'HG:rename-source' Git parameter when this isn't set, which will
+             # break bidirectionality.
+-            extra[b'hg-git-rename-source'] = b'git'
++            if not extra_in_message:
++                extra[b'hg-git-rename-source'] = b'git'
+         else:
+             renames = hg_renames
+ 
diff --git a/tools/versions.txt b/tools/versions.txt
index eaebf0e..7f85138 100644
--- a/tools/versions.txt
+++ b/tools/versions.txt
@@ -33,3 +33,8 @@ hg:4.9 hggit:0.8.13 dulwich:0.19.7 # 2019_01
 hg:5.0 hggit:0.8.13 dulwich:0.19.7 # 2019_04
 hg:5.1 hggit:0.8.13 dulwich:0.19.7 # 2019_07
 hg:5.2 hggit:0.8.13 dulwich:0.19.7 # 2019_11
+
+hg:5.3 hggit:0.9.0 dulwich:0.19.15 # 2020_01
+hg:5.4 hggit:0.9.0 dulwich:0.19.15 # 2020_04
+hg:5.5 hggit:0.9.0 dulwich:0.19.15 # 2020_08
+hg:5.6 hggit:0.9.0 dulwich:0.19.15 # 2020_10