diff --git a/ndk_patches/pwd.patch b/ndk_patches/pwd.patch
index 219ae30e6..4cbc750da 100644
--- a/ndk_patches/pwd.patch
+++ b/ndk_patches/pwd.patch
@@ -24,7 +24,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
 +		if (access(bash_path, X_OK) != -1) pw->pw_shell = (char*) bash_path;
 +		else pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
 +       } else {
-+               pw->pw_shell = realpath_buffer;
++               pw->pw_shell = strcmp(realpath_buffer, "@TERMUX_PREFIX@/bin/busybox") == 0 ? "@TERMUX_PREFIX@/bin/ash" : realpath_buffer;
 +       }
 +       pw->pw_dir = "@TERMUX_HOME@";
 +       pw->pw_passwd = "*";
diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 3ec683309..ddd28637b 100755
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.busybox.net/
 TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.23.2
-TERMUX_PKG_BUILD_REVISION=5
+TERMUX_PKG_BUILD_REVISION=6
 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
 
@@ -33,9 +33,7 @@ termux_step_post_make_install () {
 
 	cd $TERMUX_PREFIX/bin
 	rm -f ash
-	# Wasteful with a copy, but need to update pwd.h patch before fixing:
-	cp busybox ash
-	chmod +x ash
+	ln -s busybox ash
 
 	# Install busybox man page
 	mkdir -p $TERMUX_PREFIX/share/man/man1
diff --git a/packages/busybox/busybox.config b/packages/busybox/busybox.config
index e3ab8b853..c9fe958f7 100644
--- a/packages/busybox/busybox.config
+++ b/packages/busybox/busybox.config
@@ -868,7 +868,7 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 CONFIG_UDPSVD=y
 # CONFIG_VCONFIG is not set
-CONFIG_WGET=n
+CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index 96be49a5e..4882901d8 100755
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_VERSION=6.9
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}p1.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl"
 # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:
diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh
index 4bbfbee6d..714ab224e 100755
--- a/packages/tmux/build.sh
+++ b/packages/tmux/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://tmux.github.io/
 TERMUX_PKG_DESCRIPTION="Terminal multiplexer implementing switching between several programs in one terminal, detaching them and reattaching them to a different terminal"
 TERMUX_PKG_DEPENDS="ncurses, libevent"
 TERMUX_PKG_VERSION=2.0
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tmux/tmux/tmux-${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes