diff --git a/packages/topgrade/build.sh b/packages/topgrade/build.sh
index bc7f07844..2d86c3dd2 100644
--- a/packages/topgrade/build.sh
+++ b/packages/topgrade/build.sh
@@ -2,9 +2,9 @@ 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.0
+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=a818cbdc64aafe77a589299d5717988fd5e5403af0998a9945b9d17a5b6f499b
+TERMUX_PKG_SHA256=f90f25b1701e544ca1eb935b552065c0eca584eaff659920148f278aa36ee10b
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 
diff --git a/packages/topgrade/enable-tlmgr.patch b/packages/topgrade/enable-tlmgr.patch
new file mode 100644
index 000000000..53967d904
--- /dev/null
+++ b/packages/topgrade/enable-tlmgr.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..446bf4a2f
--- /dev/null
+++ b/packages/topgrade/src-main.rs.patch
@@ -0,0 +1,11 @@
+--- ./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
new file mode 100644
index 000000000..5f18e3578
--- /dev/null
+++ b/packages/topgrade/unix.rs.patch
@@ -0,0 +1,17 @@
+# 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(