diff --git a/pkgs/development/mobile/fdroidcl/default.nix b/pkgs/by-name/fd/fdroidcl/package.nix
similarity index 52%
rename from pkgs/development/mobile/fdroidcl/default.nix
rename to pkgs/by-name/fd/fdroidcl/package.nix
index 60bccaef812a..f637760f5871 100644
--- a/pkgs/development/mobile/fdroidcl/default.nix
+++ b/pkgs/by-name/fd/fdroidcl/package.nix
@@ -5,20 +5,18 @@
   android-tools,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "fdroidcl";
-  version = "0.7.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
-    owner = "mvdan";
+    owner = "Hoverth";
     repo = "fdroidcl";
-    rev = "v${version}";
-    hash = "sha256-tqhs3b/DHfnGOm9qcM56NSzt1GJflJfbemkp7+nXbug=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SmPtMNHxktyhc0/izWmAzcfCXqF2BpPNJjsrqRlU1K0=";
   };
 
-  patches = [ ./go_mod_version_update.patch ];
-
-  vendorHash = "sha256-BWbwhHjfmMjiRurrZfW/YgIzJUH/hn+7qonD0BcTLxs=";
+  vendorHash = "sha256-PNj5gkFj+ruxv1I4SezJxebDO2e1qGTYp3ZgekRLNt0=";
 
   postPatch = ''
     substituteInPlace adb/{server,device}.go \
@@ -28,11 +26,11 @@ buildGoModule rec {
   # TestScript/search attempts to connect to fdroid
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "F-Droid command line interface written in Go";
     mainProgram = "fdroidcl";
-    homepage = "https://github.com/mvdan/fdroidcl";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ aleksana ];
+    homepage = "https://github.com/Hoverth/fdroidcl";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ aleksana ];
   };
-}
+})
diff --git a/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch b/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch
deleted file mode 100644
index 079ea02c0a15..000000000000
--- a/pkgs/development/mobile/fdroidcl/go_mod_version_update.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/go.mod b/go.mod
-index a482585..5c836dd 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,10 +1,19 @@
- module mvdan.cc/fdroidcl
- 
--go 1.16
-+go 1.18
- 
- require (
- 	github.com/kr/pretty v0.3.0
- 	github.com/rogpeppe/go-internal v1.9.0
- 	github.com/schollz/progressbar/v3 v3.13.0
--	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-+)
-+
-+require (
-+	github.com/kr/text v0.2.0 // indirect
-+	github.com/mattn/go-runewidth v0.0.14 // indirect
-+	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-+	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
-+	github.com/rivo/uniseg v0.4.3 // indirect
-+	golang.org/x/sys v0.4.0 // indirect
-+	golang.org/x/term v0.4.0 // indirect
- )
-diff --git a/go.sum b/go.sum
-index 7befc16..d8523cb 100644
---- a/go.sum
-+++ b/go.sum
-@@ -23,8 +23,6 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
- github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
- github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
- github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
--github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
--github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
- github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
- github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
- github.com/schollz/progressbar/v3 v3.13.0 h1:9TeeWRcjW2qd05I8Kf9knPkW4vLM/hYoa6z9ABvxje8=
-@@ -38,7 +36,4 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
- golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
--gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
- gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd8b3b7ea2e7..5929c845e691 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2121,8 +2121,6 @@ with pkgs;
 
   fast-cli = nodePackages.fast-cli;
 
-  fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { };
-
   ### TOOLS/TYPESETTING/TEX
 
   advi = callPackage ../tools/typesetting/tex/advi {