diff --git a/packages/mathomatic/build.sh b/packages/mathomatic/build.sh
index 648df0cff..83fd7f4ae 100644
--- a/packages/mathomatic/build.sh
+++ b/packages/mathomatic/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://en.wikipedia.org/wiki/Mathomatic
 TERMUX_PKG_DESCRIPTION="Simple CAS and symbolic calculator"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=16.0.5
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL="https://fossies.org/linux/misc/old/mathomatic-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=7f525bdb2e13006549dd8f17906c26f926f5ac51174f02f074107c612491e05c
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/mathomatic/fix-paths.patch b/packages/mathomatic/fix-paths.patch
new file mode 100644
index 000000000..21242572d
--- /dev/null
+++ b/packages/mathomatic/fix-paths.patch
@@ -0,0 +1,33 @@
+diff -uNr mathomatic-16.0.5/am.h mathomatic-16.0.5.mod/am.h
+--- mathomatic-16.0.5/am.h	2012-08-19 17:42:52.000000000 +0300
++++ mathomatic-16.0.5.mod/am.h	2019-03-01 20:49:40.456989348 +0200
+@@ -57,7 +57,7 @@
+ #define	TEXT_ROWS	STANDARD_SCREEN_ROWS		/* number of lines per page in the symbolic math library */
+ #define	TEXT_COLUMNS	STANDARD_SCREEN_COLUMNS		/* default number of columns per page in the symbolic math library */
+
+-#define	TMP_FILE	"/tmp/mathomatic.XXXXXX"	/* temporary file template for mkstemp(3) */
++#define	TMP_FILE	"@TERMUX_PREFIX@/tmp/mathomatic.XXXXXX"	/* temporary file template for mkstemp(3) */
+
+ #define	PROMPT_STR	"-> "				/* user interface main prompt strings, preceded by the current equation number */
+ #define	HTML_PROMPT_STR	"−> "			/* main prompt in HTML output mode, should be same number of columns as above */
+diff -uNr mathomatic-16.0.5/help.c mathomatic-16.0.5.mod/help.c
+--- mathomatic-16.0.5/help.c	2012-10-01 13:43:46.000000000 +0300
++++ mathomatic-16.0.5.mod/help.c	2019-03-01 20:50:09.883839729 +0200
+@@ -612,7 +612,7 @@
+ #else
+ 		cp1 = getenv("SHELL");
+ 		if (cp1 == NULL) {
+-			cp1 = "/bin/sh";
++			cp1 = "@TERMUX_PREFIX@/bin/sh";
+ 		}
+ #endif
+ #if	0
+@@ -1157,7 +1157,7 @@
+ 		}
+ 		if (cp[0] == '!') {
+ 			SP("A command preceded by an exclamation point (such as \"!ls\") is taken to");
+-			SP("be a shell command and is passed unchanged to the shell (/bin/sh) when");
++			SP("be a shell command and is passed unchanged to the shell (@TERMUX_PREFIX@/bin/sh) when");
+ 			SP("Mathomatic is not in secure mode.  \"!\" by itself invokes the default shell,");
+ 			EP("which is specified in the SHELL environment variable.\n");
+
diff --git a/packages/mathomatic/fix-tmp_file.patch b/packages/mathomatic/fix-tmp_file.patch
deleted file mode 100644
index f27d1a152..000000000
--- a/packages/mathomatic/fix-tmp_file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr mathomatic-16.0.5/am.h mathomatic-16.0.5.mod/am.h
---- mathomatic-16.0.5/am.h	2012-08-19 17:42:52.000000000 +0300
-+++ mathomatic-16.0.5.mod/am.h	2017-09-14 14:36:31.112860259 +0300
-@@ -57,7 +57,7 @@
- #define	TEXT_ROWS	STANDARD_SCREEN_ROWS		/* number of lines per page in the symbolic math library */
- #define	TEXT_COLUMNS	STANDARD_SCREEN_COLUMNS		/* default number of columns per page in the symbolic math library */
- 
--#define	TMP_FILE	"/tmp/mathomatic.XXXXXX"	/* temporary file template for mkstemp(3) */
-+#define	TMP_FILE	"@TERMUX_PREFIX@/tmp/mathomatic.XXXXXX"	/* temporary file template for mkstemp(3) */
- 
- #define	PROMPT_STR	"-> "				/* user interface main prompt strings, preceded by the current equation number */
- #define	HTML_PROMPT_STR	"−> "			/* main prompt in HTML output mode, should be same number of columns as above */