diff --git a/packages/emacs/lib-src-emacsclient.c.patch b/packages/emacs/lib-src-emacsclient.c.patch
index 00e598fa0..1d692cf7f 100644
--- a/packages/emacs/lib-src-emacsclient.c.patch
+++ b/packages/emacs/lib-src-emacsclient.c.patch
@@ -14,7 +14,7 @@
  	  char sockdirname[socknamesize];
  	  int sockdirnamelen = snprintf (sockdirname, sizeof sockdirname,
 -					 "/run/user/%"PRIuMAX, id);
-+					 "@TERMUX_PREFIX/var@/run/user/%"PRIuMAX, id);
++					 "@TERMUX_PREFIX@/var/run/user/%"PRIuMAX, id);
  	  if (0 <= sockdirnamelen && sockdirnamelen < sizeof sockdirname
  	      && faccessat (AT_FDCWD, sockdirname, X_OK, AT_EACCESS) == 0)
  	    message
diff --git a/packages/emacs/lisp-cus-start.el.patch.beforehostbuild b/packages/emacs/lisp-cus-start.el.patch.beforehostbuild
index 3e5f69657..694ff979a 100644
--- a/packages/emacs/lisp-cus-start.el.patch.beforehostbuild
+++ b/packages/emacs/lisp-cus-start.el.patch.beforehostbuild
@@ -1,7 +1,6 @@
-diff -u -r ../emacs-25.0.92/lisp/cus-start.el ./lisp/cus-start.el
---- ../emacs-25.0.92/lisp/cus-start.el	2016-03-02 05:21:42.000000000 -0500
-+++ ./lisp/cus-start.el	2016-04-06 18:16:00.007272810 -0400
-@@ -277,7 +277,7 @@
+--- ../emacs.orig/lisp/cus-start.el	2019-12-26 17:20:12.000000000 +0100
++++ ./lisp/cus-start.el	2019-12-27 14:18:51.628517987 +0100
+@@ -290,7 +290,7 @@
  			  "/tmp"))
  		     (t
  		      (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
diff --git a/packages/emacs/lisp-loadup.el-2.patch.beforehostbuild b/packages/emacs/lisp-loadup.el.patch.beforehostbuild
similarity index 72%
rename from packages/emacs/lisp-loadup.el-2.patch.beforehostbuild
rename to packages/emacs/lisp-loadup.el.patch.beforehostbuild
index e316780ca..129309ef2 100644
--- a/packages/emacs/lisp-loadup.el-2.patch.beforehostbuild
+++ b/packages/emacs/lisp-loadup.el.patch.beforehostbuild
@@ -1,7 +1,6 @@
-diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
---- ../emacs-25.0.92/lisp/loadup.el	2016-09-06 09:49:51.838175278 +0300
-+++ ./lisp/loadup.el	2016-09-06 09:57:18.694585441 +0300
-@@ -378,7 +378,11 @@
+--- ../emacs.orig/lisp/loadup.el	2019-12-26 17:20:12.000000000 +0100
++++ ./lisp/loadup.el	2019-12-27 14:18:51.648517987 +0100
+@@ -421,7 +421,11 @@
        (message "Warning: Change in load-path due to site-init will be \
  lost after dumping")))
  
diff --git a/packages/emacs/no_user_fullname.patch b/packages/emacs/no_user_fullname.patch
index 4a99de697..0d7ff1d9f 100644
--- a/packages/emacs/no_user_fullname.patch
+++ b/packages/emacs/no_user_fullname.patch
@@ -1,12 +1,12 @@
-diff -u -r ../emacs-24.3/src/editfns.c ./src/editfns.c
---- ../emacs-24.3/src/editfns.c	2013-01-01 21:37:17.000000000 +0100
-+++ ./src/editfns.c	2014-02-19 03:21:55.000000000 +0100
-@@ -1304,7 +1304,7 @@
+diff -u -r ../emacs.orig/src/editfns.c ./src/editfns.c
+--- ../emacs.orig/src/editfns.c 2019-12-26 17:20:12.000000000 +0100
++++ ./src/editfns.c     2019-12-27 14:19:14.204517971 +0100
+@@ -1250,7 +1250,7 @@
    if (!pw)
      return Qnil;
- 
+
 -  p = USER_FULL_NAME;
 +  p = "unknown";
    /* Chop off everything after the first comma. */
    q = strchr (p, ',');
-   full = make_string (p, q ? q - p : strlen (p));
+   full = make_string (p, q ? q - p : strlen (p));
\ No newline at end of file
diff --git a/packages/emacs/src-callproc.c.patch b/packages/emacs/src-callproc.c.patch
index 032c14306..e37d888b8 100644
--- a/packages/emacs/src-callproc.c.patch
+++ b/packages/emacs/src-callproc.c.patch
@@ -1,12 +1,11 @@
-diff -u -r ../emacs-25.0.92/src/callproc.c ./src/callproc.c
---- ../emacs-25.0.92/src/callproc.c	2016-03-02 05:21:43.000000000 -0500
-+++ ./src/callproc.c	2016-03-25 22:02:38.977310920 -0400
-@@ -1619,7 +1619,7 @@
+--- ../emacs.orig/src/callproc.c	2019-12-26 17:20:12.000000000 +0100
++++ ./src/callproc.c	2019-12-27 14:19:14.228517971 +0100
+@@ -1589,7 +1589,7 @@
      dir_warning ("arch-independent data dir", Vdata_directory);
  
    sh = getenv ("SHELL");
 -  Vshell_file_name = build_string (sh ? sh : "/bin/sh");
 +  Vshell_file_name = build_string (sh ? sh : "@TERMUX_PREFIX@/bin/sh");
  
- #ifdef DOS_NT
-   Vshared_game_score_directory = Qnil;
+   Lisp_Object gamedir = Qnil;
+   if (PATH_GAME)