diff --git a/ndk_patches/sys-wait.h.patch b/ndk_patches/sys-wait.h.patch
index 7d53fcde7..b91a233e3 100644
--- a/ndk_patches/sys-wait.h.patch
+++ b/ndk_patches/sys-wait.h.patch
@@ -1,12 +1,7 @@
-diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/include/sys/wait.h ./usr/include/sys/wait.h
---- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/include/sys/wait.h	2014-10-14 22:53:49.000000000 -0400
-+++ ./usr/include/sys/wait.h	2015-06-25 06:32:11.975176739 -0400
-@@ -44,10 +44,13 @@
- #define WIFEXITED(s)    (WTERMSIG(s) == 0)
- #define WIFSTOPPED(s)   (WTERMSIG(s) == 0x7f)
- #define WIFSIGNALED(s)  (WTERMSIG((s)+1) >= 2)
-+#define WIFCONTINUED(x) (WIFSTOPPED(x) && WSTOPSIG(x) == 0x13)
- 
+diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/sys/wait.h ./usr/include/sys/wait.h
+--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/sys/wait.h	2014-10-14 22:53:49.000000000 -0400
++++ ./usr/include/sys/wait.h	2015-07-11 16:55:21.567042577 -0400
+@@ -48,6 +48,8 @@
  extern pid_t  wait(int *);
  extern pid_t  waitpid(pid_t, int *, int);
  extern pid_t  wait4(pid_t, int *, int, struct rusage *);
diff --git a/packages/bash/build.sh b/packages/bash/build.sh
index 498b7a061..9a85b5e20 100755
--- a/packages/bash/build.sh
+++ b/packages/bash/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools"
 _MAIN_VERSION=4.3
 _PATCH_VERSION=39
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline ac_cv_header_grp_h=no ac_cv_header_pwd_h=no ac_cv_rl_version=6.3"
 
diff --git a/packages/neovim/nvim-os-job.c.patch b/packages/neovim/nvim-os-job.c.patch
new file mode 100644
index 000000000..eafb23952
--- /dev/null
+++ b/packages/neovim/nvim-os-job.c.patch
@@ -0,0 +1,14 @@
+Submitted upstream at https://github.com/neovim/neovim/pull/2997
+
+diff -u -r ../neovim-master/src/nvim/os/job.c ./src/nvim/os/job.c
+--- ../neovim-master/src/nvim/os/job.c	2015-07-10 16:11:13.000000000 -0400
++++ ./src/nvim/os/job.c	2015-07-11 17:00:34.310021574 -0400
+@@ -445,7 +445,7 @@
+     return;
+   }
+ 
+-  if (WIFSTOPPED(stat) || WIFCONTINUED(stat)) {
++  if (WIFSTOPPED(stat)) {
+     // Only care for processes that exited
+     return;
+   }
diff --git a/packages/python/build.sh b/packages/python/build.sh
index 6c73ffb6f..f164b1b15 100644
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=3.4
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.
diff --git a/packages/strace/build.sh b/packages/strace/build.sh
index ac047a8f3..c3c229a58 100755
--- a/packages/strace/build.sh
+++ b/packages/strace/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://sourceforge.net/projects/strace/
 TERMUX_PKG_DESCRIPTION="Debugging utility to monitor the system calls used by a program and all the signals it receives"
 TERMUX_PKG_VERSION=4.10
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/strace/strace/${TERMUX_PKG_VERSION}/strace-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL=bin/strace-graph # This is a perl script
 
diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh
index bb2912ad5..dfd4ff9db 100644
--- a/packages/zsh/build.sh
+++ b/packages/zsh/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE="http://www.zsh.org/"
 TERMUX_PKG_DESCRIPTION="Shell designed for interactive use, although it is also a powerful scripting language"
 TERMUX_PKG_VERSION=5.0.8
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL="http://downloads.sourceforge.net/project/zsh/zsh/${TERMUX_PKG_VERSION}/zsh-${TERMUX_PKG_VERSION}.tar.bz2"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${TERMUX_PKG_VERSION}"
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-tools"