diff --git a/packages/termux-tools/am b/packages/termux-tools/am
deleted file mode 100755
index a4b796f0c..000000000
--- a/packages/termux-tools/am
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Remove LD_LIBRARY_PATH from environment to avoid conflicting
-# with system libraries that am may link against.
-
-LD_LIBRARY_PATH= exec /system/bin/am $@
diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 55cee7562..c1efcb2ba 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,9 +1,17 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"
-TERMUX_PKG_VERSION=0.17
+TERMUX_PKG_VERSION=0.18
 
 termux_step_make_install () {
 	$CXX $CFLAGS $LDFLAGS -std=c++14 -Wall -Wextra -pedantic -Werror $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
 
-	cp -p $TERMUX_PKG_BUILDER_DIR/{am,pm,df,ping,logcat,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
+	# Remove LD_LIBRARY_PATH from environment to avoid conflicting
+	# with system libraries that am may link against.
+	for tool in am dalvikvm df logcat ping pm; do
+		echo '#!/bin/sh' > $TERMUX_PREFIX/bin/$tool
+		echo "LD_LIBRARY_PATH= exec /system/bin/$tool \$@" >> $TERMUX_PREFIX/bin/$tool
+		chmod +x $TERMUX_PREFIX/bin/$tool
+	done
+
+	cp -p $TERMUX_PKG_BUILDER_DIR/{termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
 }
diff --git a/packages/termux-tools/df b/packages/termux-tools/df
deleted file mode 100755
index 5a1823acf..000000000
--- a/packages/termux-tools/df
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Remove LD_LIBRARY_PATH from environment to avoid conflicting
-# with system libraries that df may link against.
-
-LD_LIBRARY_PATH= exec /system/bin/df $@
diff --git a/packages/termux-tools/logcat b/packages/termux-tools/logcat
deleted file mode 100755
index 676d8cf4d..000000000
--- a/packages/termux-tools/logcat
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-LD_LIBRARY_PATH= exec /system/bin/logcat $@
diff --git a/packages/termux-tools/ping b/packages/termux-tools/ping
deleted file mode 100755
index 13bff51ea..000000000
--- a/packages/termux-tools/ping
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-LD_LIBRARY_PATH= exec /system/bin/ping $@
diff --git a/packages/termux-tools/pm b/packages/termux-tools/pm
deleted file mode 100755
index 5607e8512..000000000
--- a/packages/termux-tools/pm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Remove LD_LIBRARY_PATH from environment to avoid conflicting
-# with system libraries that pm may link against.
-
-LD_LIBRARY_PATH= exec /system/bin/pm $@