diff --git a/packages/kubectl/build.sh b/packages/kubectl/build.sh
index de9c5639f..96b1a3036 100644
--- a/packages/kubectl/build.sh
+++ b/packages/kubectl/build.sh
@@ -20,7 +20,7 @@ termux_step_get_source() {
 termux_step_make() {
 	termux_setup_golang
 
-	# Needed to generate manpages.
+	#Needed to generate manpages.
 	#(
 	#	export GOPATH="$TERMUX_PKG_BUILDDIR/host"
 	#	unset GOOS GOARCH CGO_LDFLAGS
diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh
index 8318bd35a..143e39c4d 100644
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@@ -19,7 +19,7 @@ ac_cv_func_dn_expand=no
 
 termux_step_pre_configure() {
 	if $TERMUX_DEBUG; then
-		# When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
+		#When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
 		# /home/builder/.termux-build/_lib/16-aarch64-21-v3/bin/../sysroot/usr/include/bits/fortify/string.h:79:26: error: use of undeclared identifier '__USE_FORTIFY_LEVEL'
 		export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
 	fi
diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh
index f92de2d7a..16c4df2b1 100644
--- a/packages/libgrpc/build.sh
+++ b/packages/libgrpc/build.sh
@@ -30,6 +30,7 @@ termux_step_post_get_source() {
 
 termux_step_host_build() {
 	termux_setup_cmake
+	termux_setup_ninja
 
 	cd $TERMUX_PKG_SRCDIR
 	export LD=gcc
@@ -41,11 +42,10 @@ termux_step_host_build() {
 	# when building version 1.17.2:
 	CXXFLAGS="-Wno-error=class-memaccess" \
 		CFLAGS="-Wno-implicit-fallthrough" \
-		make -j $TERMUX_MAKE_PROCESSES \
-		HAS_SYSTEM_PROTOBUF=false \
-		prefix=$TERMUX_PKG_HOSTBUILD_DIR \
-		install
-	make clean
+		cmake -G Ninja -DCMAKE_INSTALL_PREFIX=$TERMUX_PKG_HOSTBUILD_DIR
+	ninja -j $TERMUX_MAKE_PROCESSES install
+	ninja -t clean
+	rm -rf CMakeCache.txt CMakeFiles
 }
 
 termux_step_pre_configure() {
diff --git a/packages/libgrpc/fix-arg-list-too-long.patch.beforehostbuild b/packages/libgrpc/fix-arg-list-too-long.patch.beforehostbuild
deleted file mode 100644
index 0a1df29bb..000000000
--- a/packages/libgrpc/fix-arg-list-too-long.patch.beforehostbuild
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile	2018-06-26 11:07:45.948160976 +0200
-+++ b/Makefile	2019-06-26 11:04:25.798966336 +0200
-@@ -2820,13 +2820,15 @@
-
- install-headers_c:
- 	$(E) "[INSTALL] Installing public C headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) for h in $(PUBLIC_HEADERS_C); do \
-+	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+	done
-
- install-headers_cxx:
- 	$(E) "[INSTALL] Installing public C++ headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+	done
-
- install-static: install-static_c install-static_cxx
-
---- a/templates/Makefile.template	2019-06-26 12:38:36.777292299 +0200
-+++ b/templates/Makefile.template	2019-06-26 12:48:35.668550020 +0200
-@@ -1302,13 +1302,15 @@
-
-   install-headers_c:
-   	$(E) "[INSTALL] Installing public C headers"
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+  	$(Q) for h in $(PUBLIC_HEADERS_C); do \
-+  	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+  	done
-
-   install-headers_cxx:
-   	$(E) "[INSTALL] Installing public C++ headers"
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+  	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+  	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+  	done
-
-   install-static: install-static_c install-static_cxx
-