diff --git a/packages/bgrep/build.sh b/packages/bgrep/build.sh
index d4c33966c..c3935ce4e 100644
--- a/packages/bgrep/build.sh
+++ b/packages/bgrep/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://debugmo.de/2009/04/bgrep-a-binary-grep/
 TERMUX_PKG_DESCRIPTION="Binary string grep tool"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/rsharo/bgrep/archive/bgrep-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ba5ddae672e84bf2d8ce91429a4ce8a5e3a154ee7e64d1016420f7dc7481ec0a
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/blackbox/build.sh b/packages/blackbox/build.sh
index f4879906f..ebe82c04b 100644
--- a/packages/blackbox/build.sh
+++ b/packages/blackbox/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/StackExchange/blackbox
 TERMUX_PKG_DESCRIPTION="Safely store secrets in Git/Mercurial/Subversion"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.0.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/StackExchange/blackbox/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0a8fee39dc46436472528ea3a5743c42ebefc068519545fe6fca57041f42deae
 TERMUX_PKG_DEPENDS="gnupg"
diff --git a/packages/check/build.sh b/packages/check/build.sh
index 9d68ea6ef..04a7edd65 100644
--- a/packages/check/build.sh
+++ b/packages/check/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://libcheck.github.io/check
 TERMUX_PKG_DESCRIPTION="A unit testing framework for C"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.15.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libcheck/check/releases/download/${TERMUX_PKG_VERSION}/check-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/dirb/build.sh b/packages/dirb/build.sh
index ee8d44131..6ffd91bf2 100644
--- a/packages/dirb/build.sh
+++ b/packages/dirb/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://dirb.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Web Directory Fuzzer."
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.22
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/dirb/files/dirb/${TERMUX_PKG_VERSION}/dirb${TERMUX_PKG_VERSION/./}.tar.gz
 TERMUX_PKG_SHA256=f3748ade231ca211a01acbec31cc6a3b576f6c56c906d73329d7dbb79f60fc2c
 TERMUX_PKG_DEPENDS="libcurl"
diff --git a/packages/dnsmap/build.sh b/packages/dnsmap/build.sh
index a1cdcb7c6..c99c4db7e 100644
--- a/packages/dnsmap/build.sh
+++ b/packages/dnsmap/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/resurrecting-open-source-projects/dnsmap
 TERMUX_PKG_DESCRIPTION="Subdomain Bruteforcing Tool"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.36
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/resurrecting-open-source-projects/dnsmap/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=f52d6d49cbf9a60f601c919f99457f108d51ecd011c63e669d58f38d50ad853c
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/jo/build.sh b/packages/jo/build.sh
index c2646848f..2002f2468 100644
--- a/packages/jo/build.sh
+++ b/packages/jo/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://jpmens.net/2016/03/05/a-shell-command-to-create-json-jo/
 TERMUX_PKG_DESCRIPTION="JSON output from a shell"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/jpmens/jo/releases/download/${TERMUX_PKG_VERSION}/jo-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=24c64d2eb863900947f58f32b502c95fec8f086105fd31151b91f54b7b5256a2
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/logrotate/build.sh b/packages/logrotate/build.sh
index 8e5f60c6f..624181bfe 100644
--- a/packages/logrotate/build.sh
+++ b/packages/logrotate/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/logrotate/logrotate
 TERMUX_PKG_DESCRIPTION="Simplify the administration of log files on a system which generates a lot of log files"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @shoya0x00"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.18.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/logrotate/logrotate/releases/download/${TERMUX_PKG_VERSION}/logrotate-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=14a924e4804b3974e85019a9f9352c2a69726702e6656155c48bcdeace68a5dc
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/microsocks/build.sh b/packages/microsocks/build.sh
index 62aab406b..e64a2684a 100644
--- a/packages/microsocks/build.sh
+++ b/packages/microsocks/build.sh
@@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rofl0r/microsocks
 TERMUX_PKG_DESCRIPTION="tiny, portable SOCKS5 server with very moderate resource usage"
 TERMUX_PKG_LICENSE="MIT"
 _COMMIT=5795a84c4fbd61685690a8cd6d43969efc083614
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2020.08.14-${_COMMIT:0:8}
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/rofl0r/microsocks/archive/${_COMMIT}.tar.gz
 TERMUX_PKG_SHA256=7c5442be114b514a1a33c5219a8746a8232455c4d46aa418534f3ef2694779bc
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/wget2/build.sh b/packages/wget2/build.sh
index 0854df176..7c0a14a2c 100644
--- a/packages/wget2/build.sh
+++ b/packages/wget2/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://gitlab.com/gnuwget/wget2
 TERMUX_PKG_DESCRIPTION="The successor of GNU Wget, a file and recursive website downloader"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @shoya0x00"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.99.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/wget/wget2-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=cbc48f55fa22ed2acbccf032c208c133cc59c7432cda8518a4992eb5882b6563
 TERMUX_PKG_DEPENDS="gpgme, libandroid-glob, libassuan, libgnutls, libgpg-error, pcre2"