diff --git a/packages/parted/build.sh b/packages/parted/build.sh
index adf9571c2..75373b682 100644
--- a/packages/parted/build.sh
+++ b/packages/parted/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/parted/
 TERMUX_PKG_DESCRIPTION="Versatile partition editor"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=3.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/parted/parted-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44
 TERMUX_PKG_DEPENDS="libiconv, libuuid, readline"
diff --git a/packages/rhash/build.sh b/packages/rhash/build.sh
index bb891fa97..056cef28c 100644
--- a/packages/rhash/build.sh
+++ b/packages/rhash/build.sh
@@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rhash/RHash
 TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.4.0
-TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=2ea39540f5c580da0e655f7b483c19e0d31506aed4202d88e8459fa7aeeb8861
 TERMUX_PKG_DEPENDS="openssl"
diff --git a/packages/seafile-client/build.sh b/packages/seafile-client/build.sh
index 3b3cc4e75..e6a045653 100644
--- a/packages/seafile-client/build.sh
+++ b/packages/seafile-client/build.sh
@@ -15,7 +15,7 @@ termux_step_pre_configure() {
 }
 
 termux_step_post_configure() {
-	#the package has trouble to prepare some headers
+	# the package has trouble to prepare some headers
 	cd $TERMUX_PKG_SRCDIR/lib
 	python $TERMUX_PREFIX/bin/searpc-codegen.py $TERMUX_PKG_SRCDIR/lib/rpc_table.py
 }
diff --git a/packages/sensible-utils/build.sh b/packages/sensible-utils/build.sh
index 6c263e614..10ae5373c 100644
--- a/packages/sensible-utils/build.sh
+++ b/packages/sensible-utils/build.sh
@@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/sid/sensible-utils
 TERMUX_PKG_DESCRIPTION="Small utilities used by programs to sensibly select and spawn an appropriate browser, editor, or pager"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.0.13
-TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=8627a530e48066282aa81384dddfb38cf53c8470ae7e633c14d2341418fa6298
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_prog_PO4A=/bin/echo"
diff --git a/packages/util-linux/build.sh b/packages/util-linux/build.sh
index dd766db63..1199592e6 100644
--- a/packages/util-linux/build.sh
+++ b/packages/util-linux/build.sh
@@ -36,7 +36,7 @@ ac_cv_func_unshare=yes
 
 termux_step_pre_configure() {
 	if [ $TERMUX_ARCH_BITS = 64 ]; then
-		#prlimit() is only available in 64-bit bionic.
+		# prlimit() is only available in 64-bit bionic.
 		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_prlimit=yes"
 	fi
 }
diff --git a/packages/util-linux/fix-paths.patch b/packages/util-linux/fix-paths.patch
index 9b08555d1..3b97392a3 100644
--- a/packages/util-linux/fix-paths.patch
+++ b/packages/util-linux/fix-paths.patch
@@ -1,7 +1,7 @@
 diff -uNr util-linux-2.35.2/include/pathnames.h util-linux-2.35.2.mod/include/pathnames.h
 --- util-linux-2.35.2/include/pathnames.h	2020-05-20 15:27:43.450013565 +0300
 +++ util-linux-2.35.2.mod/include/pathnames.h	2020-07-09 01:54:37.539260814 +0300
-@@ -202,4 +202,105 @@
+@@ -202,4 +202,107 @@
  #define _PATH_DEV_RFKILL	"/dev/rfkill"
  #define _PATH_SYS_RFKILL	"/sys/class/rfkill"
  
@@ -18,6 +18,7 @@ diff -uNr util-linux-2.35.2/include/pathnames.h util-linux-2.35.2.mod/include/pa
 +# undef _PATH_LOGIN
 +# undef _PATH_SHUTDOWN
 +# undef _PATH_POWEROFF
++# undef _PATH_VI
 +# undef _PATH_TERMCOLORS_DIR
 +# undef _PATH_PASSWD
 +# undef _PATH_GSHADOW
@@ -58,6 +59,7 @@ diff -uNr util-linux-2.35.2/include/pathnames.h util-linux-2.35.2.mod/include/pa
 +# define _PATH_LOGIN           "@TERMUX_PREFIX@/bin/login"
 +# define _PATH_SHUTDOWN        "@TERMUX_PREFIX@/bin/shutdown"
 +# define _PATH_POWEROFF        "@TERMUX_PREFIX@/bin/poweroff"
++# define _PATH_VI              "@TERMUX_PREFIX@/bin/vi"
 +# define _PATH_TERMCOLORS_DIR  "@TERMUX_PREFIX@/etc/" _PATH_TERMCOLORS_DIRNAME
 +
 +// Termux doesn't support multiuser environment.
@@ -410,6 +412,17 @@ diff -uNr util-linux-2.35.2/sys-utils/setpriv.c util-linux-2.35.2.mod/sys-utils/
  
  static gid_t get_group(const char *s, const char *err);
  
+diff -uNr util-linux-2.35.2/text-utils/more.c util-linux-2.35.2.mod/text-utils/more.c
+--- util-linux-2.35.2/text-utils/more.c	2020-05-20 15:27:43.565012854 +0300
++++ util-linux-2.35.2.mod/text-utils/more.c	2020-07-09 01:53:27.890946819 +0300
+@@ -78,6 +78,7 @@
+ # include <magic.h>
+ #endif
+ 
++#include "pathnames.h"
+ #include "strutils.h"
+ #include "nls.h"
+ #include "xalloc.h"
 diff -uNr util-linux-2.35.2/text-utils/pg.c util-linux-2.35.2.mod/text-utils/pg.c
 --- util-linux-2.35.2/text-utils/pg.c	2020-05-20 15:27:43.565012854 +0300
 +++ util-linux-2.35.2.mod/text-utils/pg.c	2020-07-09 01:53:27.894946836 +0300