diff --git a/packages/topgrade/build.sh b/packages/topgrade/build.sh
index 2d86c3dd29..1e751a2ee8 100644
--- a/packages/topgrade/build.sh
+++ b/packages/topgrade/build.sh
@@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/r-darwish/topgrade/
 TERMUX_PKG_DESCRIPTION="Upgrade all the things"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@laurentlbm"
-TERMUX_PKG_VERSION=8.3.1
-TERMUX_PKG_SRCURL=https://github.com/r-darwish/topgrade/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=f90f25b1701e544ca1eb935b552065c0eca584eaff659920148f278aa36ee10b
+TERMUX_PKG_VERSION=9.0.0
+TERMUX_PKG_SRCURL="https://github.com/r-darwish/topgrade/archive/v${TERMUX_PKG_VERSION}.tar.gz"
+TERMUX_PKG_SHA256=71277152555cfaf1359884a5d094ba841b9b6fc679337871b87476ec5a11c168
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_post_make_install() {
-	install -Dm600 -t $TERMUX_PREFIX/share/man/man8 $TERMUX_PKG_SRCDIR/topgrade.8
+	install -Dm600 -t "${TERMUX_PREFIX}"/share/man/man8 "${TERMUX_PKG_SRCDIR}"/topgrade.8
 }
diff --git a/packages/topgrade/enable-tlmgr.patch b/packages/topgrade/enable-tlmgr.patch
deleted file mode 100644
index 53967d904a..0000000000
--- a/packages/topgrade/enable-tlmgr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/steps/generic.rs b/src/steps/generic.rs
-index 0caeff1..5beafcc 100644
---- a/src/steps/generic.rs
-+++ b/src/steps/generic.rs
-@@ -285,9 +285,9 @@ pub fn run_stack_update(run_type: RunType) -> Result<()> {
- 
- pub fn run_tlmgr_update(ctx: &ExecutionContext) -> Result<()> {
-     cfg_if::cfg_if! {
--        if #[cfg(target_os = "linux")] {
-+        if #[cfg(any(target_os = "linux", target_os = "android"))] {
-             if !ctx.config().enable_tlmgr_linux() {
--                return Err(SkipStep(String::from("tlmgr must be explicity enabled in the configuration to run in Linux")).into());
-+                return Err(SkipStep(String::from("tlmgr must be explicity enabled in the configuration to run in Android/Linux")).into());
-             }
-         }
-     }
diff --git a/packages/topgrade/src-main.rs.patch b/packages/topgrade/src-main.rs.patch
deleted file mode 100644
index 446bf4a2f3..0000000000
--- a/packages/topgrade/src-main.rs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/main.rs.orig	2022-04-14 13:08:45.484972466 +0530
-+++ ./src/main.rs	2022-04-14 13:09:28.774972450 +0530
-@@ -280,7 +280,7 @@
-         runner.execute(Step::Tmux, "tmux", || tmux::run_tpm(&base_dirs, run_type))?;
-         runner.execute(Step::Tldr, "TLDR", || unix::run_tldr(run_type))?;
-         runner.execute(Step::Pearl, "pearl", || unix::run_pearl(run_type))?;
--        #[cfg(not(target_os = "macos"))]
-+        #[cfg(not(any(target_os = "macos", target_os = "android")))]
-         runner.execute(Step::GnomeShellExtensions, "Gnome Shell Extensions", || {
-             unix::upgrade_gnome_extensions(&ctx)
-         })?;
diff --git a/packages/topgrade/unix.rs.patch b/packages/topgrade/unix.rs.patch
deleted file mode 100644
index 5f18e35780..0000000000
--- a/packages/topgrade/unix.rs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# This is literally bug fix, not port patch.
-# I have requested a pull to upstream, will remove it
-# when it is merged.
-
-diff --git a/src/steps/os/unix.rs b/src/steps/os/unix.rs
-index 52df093..61cefc7 100644
---- a/src/steps/os/unix.rs
-+++ b/src/steps/os/unix.rs
-@@ -135,7 +135,7 @@ pub fn run_fish_plug(ctx: &ExecutionContext) -> Result<()> {
-     ctx.run_type().execute(&fish).args(&["-c", "plug update"]).check_run()
- }
- 
--#[cfg(not(target_os = "macos"))]
-+#[cfg(not(any(target_os = "android", target_os = "macos")))]
- pub fn upgrade_gnome_extensions(ctx: &ExecutionContext) -> Result<()> {
-     let gdbus = require("gdbus")?;
-     require_option(