diff --git a/patches/emacs-26.1.local.patch b/patches/emacs-26.1.local.patch
index 3c24451..f4dd571 100644
--- a/patches/emacs-26.1.local.patch
+++ b/patches/emacs-26.1.local.patch
@@ -97,12 +97,18 @@ Only in emacs-26.1/lib: .binary-io.h.swp
 diff -ru emacs-26.1.orig/lib-src/Makefile.in emacs-26.1/lib-src/Makefile.in
 --- emacs-26.1.orig/lib-src/Makefile.in	2018-04-23 16:17:42.000000000 +0200
 +++ emacs-26.1/lib-src/Makefile.in	2018-11-28 19:25:21.901162314 +0100
-@@ -389,7 +389,7 @@
+@@ -388,8 +388,12 @@ profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
+ 	$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
  	  $(NTLIB) $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o $@
  
- make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
+-make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
 -	$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(NTLIB) $(LOADLIBES) -o $@
-+	$(AM_V_CCLD)$(BUILDCC) ${ALL_CFLAGS} $< $(NTLIB) $(LOADLIBES) -o $@
++make-docfile${EXEEXT}: CFLAGS_FOR_BUILD += -std=gnu99
++make-docfile${EXEEXT}: CFLAGS_FOR_BUILD += -I../src
++make-docfile${EXEEXT}: CFLAGS_FOR_BUILD += -I${srcdir}/../src -I${srcdir}/../lib
++make-docfile${EXEEXT}: CFLAGS_FOR_BUILD += -D_BINARY_H -Dset_binary_mode\(x\,y\)
++make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(config_h)
++	$(AM_V_CCLD)$(BUILDCC) $< -o $@ $(CFLAGS_FOR_BUILD)
  
  movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
  	$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
diff --git a/vars/build.vars b/vars/build.vars
index 0aabfbe..b26347d 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1173,7 +1173,7 @@ tzdb vim xcowsay xeyes xorriso xterm xwd";
 : ${PKG_EMACS_VERSION:=26.1};
 : ${PKG_EMACS_URL:=http://www.gutscheinrausch.de/mirror/gnu/emacs/emacs-${PKG_EMACS_VERSION}.tar.xz};
 : ${PKG_EMACS_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -O1 -g2"};
-: ${PKG_EMACS_CONFIGURE_ARGS_EXTRA:="--with-modules --with-sound=no --with-x-toolkit=no --without-dbus"};
+: ${PKG_EMACS_CONFIGURE_ARGS_EXTRA:="--with-modules --with-sound=no --with-x-toolkit=no --without-dbus --without-x --without-mailutils --without-pop"};
 : ${PKG_EMACS_ENV_VARS_EXTRA:="BUILDCC=gcc"};
 : ${PKG_FETCHMAIL_SHA256SUM:=c7500bed3b0bb85722f7cf2d980e74a879ac57b13cfd225d278179d671c0f5e8};
 : ${PKG_FETCHMAIL_VERSION:=6.4.0.beta4};