diff --git a/packages/m4/build.sh b/packages/m4/build.sh
index c59e623fa..345e60637 100644
--- a/packages/m4/build.sh
+++ b/packages/m4/build.sh
@@ -2,5 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/m4/m4.html
 TERMUX_PKG_DESCRIPTION="Traditional Unix macro processor"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=1.4.18
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/m4/m4-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
diff --git a/packages/m4/fix-paths.patch b/packages/m4/fix-paths.patch
new file mode 100644
index 000000000..e69db88ff
--- /dev/null
+++ b/packages/m4/fix-paths.patch
@@ -0,0 +1,58 @@
+diff -uNr m4-1.4.18/lib/spawni.c m4-1.4.18.mod/lib/spawni.c
+--- m4-1.4.18/lib/spawni.c	2016-12-31 15:54:42.000000000 +0200
++++ m4-1.4.18.mod/lib/spawni.c	2019-03-01 20:54:18.601984363 +0200
+@@ -32,7 +32,7 @@
+ #if _LIBC || HAVE_PATHS_H
+ # include <paths.h>
+ #else
+-# define _PATH_BSHELL "/bin/sh"
++# define _PATH_BSHELL "@TERMUX_PREFIX@/bin/sh"
+ #endif
+ 
+ #include <signal.h>
+diff -uNr m4-1.4.18/lib/tempname.c m4-1.4.18.mod/lib/tempname.c
+--- m4-1.4.18/lib/tempname.c	2016-12-31 15:54:42.000000000 +0200
++++ m4-1.4.18.mod/lib/tempname.c	2019-03-01 20:52:48.978132063 +0200
+@@ -32,7 +32,7 @@
+ 
+ #include <stdio.h>
+ #ifndef P_tmpdir
+-# define P_tmpdir "/tmp"
++# define P_tmpdir "@TERMUX_PREFIX@/tmp"
+ #endif
+ #ifndef TMP_MAX
+ # define TMP_MAX 238328
+@@ -148,8 +148,8 @@
+     {
+       if (direxists (P_tmpdir))
+         dir = P_tmpdir;
+-      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+-        dir = "/tmp";
++      else if (strcmp (P_tmpdir, "@TERMUX_PREFIX@/tmp") != 0 && direxists ("@TERMUX_PREFIX@/tmp"))
++        dir = "@TERMUX_PREFIX@/tmp";
+       else
+         {
+           __set_errno (ENOENT);
+diff -uNr m4-1.4.18/lib/tmpdir.c m4-1.4.18.mod/lib/tmpdir.c
+--- m4-1.4.18/lib/tmpdir.c	2016-12-31 15:54:42.000000000 +0200
++++ m4-1.4.18.mod/lib/tmpdir.c	2019-03-01 20:53:16.521626327 +0200
+@@ -36,7 +36,7 @@
+ # ifdef _P_tmpdir /* native Windows */
+ #  define P_tmpdir _P_tmpdir
+ # else
+-#  define P_tmpdir "/tmp"
++#  define P_tmpdir "@TERMUX_PREFIX@/tmp"
+ # endif
+ #endif
+ 
+@@ -130,8 +130,8 @@
+ #endif
+       if (direxists (P_tmpdir))
+         dir = P_tmpdir;
+-      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+-        dir = "/tmp";
++      else if (strcmp (P_tmpdir, "@TERMUX_PREFIX@/tmp") != 0 && direxists ("@TERMUX_PREFIX@/tmp"))
++        dir = "@TERMUX_PREFIX@/tmp";
+       else
+         {
+           __set_errno (ENOENT);