diff --git a/srcpkgs/emacs/files/musl.patch b/srcpkgs/emacs/files/musl.patch
deleted file mode 100644
index a541a7b064..0000000000
--- a/srcpkgs/emacs/files/musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- configure
-+++ configure
-@@ -2092,7 +2092,7 @@
- 
- system_malloc=$emacs_cv_sanitize_address
- 
--hybrid_malloc=
-+hybrid_malloc=yes
- 
- case "$opsys" in
-   ## darwin ld insists on the use of malloc routines in the System framework.
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -373,6 +373,7 @@
- 	region-cache.o sound.o atimer.o \
- 	doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
- 	profiler.o decompress.o \
-+	sheap.o \
- 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
- 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
- obj = $(base_obj) $(NS_OBJC_OBJ)
---- src/gmalloc.c
-+++ src/gmalloc.c
-@@ -72,7 +72,7 @@
- #define free gfree
- #endif  /* HYBRID_MALLOC */
- 
--#ifdef CYGWIN
-+//#ifdef CYGWIN
- extern void *bss_sbrk (ptrdiff_t size);
- extern int bss_sbrk_did_unexec;
- extern char bss_sbrk_buffer[];
-@@ -80,7 +80,7 @@
- #define DUMPED bss_sbrk_did_unexec
- #define ALLOCATED_BEFORE_DUMPING(P) \
-   ((P) < bss_sbrk_buffer_end && (P) >= (void *) bss_sbrk_buffer)
--#endif
-+//#endif
- 
- #ifdef	__cplusplus
- extern "C"
-@@ -1525,16 +1525,19 @@
- __default_morecore (ptrdiff_t increment)
- {
-   void *result;
--#if defined (CYGWIN)
-+//#if defined (CYGWIN)
-   if (!DUMPED)
-     {
-       return bss_sbrk (increment);
-     }
--#endif
-+//#endif
-+#if 0
-   result = (void *) __sbrk (increment);
-   if (result == (void *) -1)
-     return NULL;
-   return result;
-+#endif
-+  return NULL;
- }
- /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
- 
---- src/print.c
-+++ src/print.c
-@@ -755,7 +755,7 @@
-   print_output_debug_flag = x;
- }
- 
--#if defined (GNU_LINUX)
-+#if defined (GNU_LINUX) && defined (__GLIBC__)
- 
- /* This functionality is not vitally important in general, so we rely on
-    non-portable ability to use stderr as lvalue.  */
---- src/unexelf.c
-+++ src/unexelf.c
-@@ -632,6 +632,9 @@
-   off_t new_file_size;
-   void *new_break;
- 
-+  extern int bss_sbrk_did_unexec;
-+  bss_sbrk_did_unexec = 1;
-+
-   /* Pointers to the base of the image of the two files.  */
-   caddr_t old_base, new_base;
- 
-
diff --git a/srcpkgs/emacs/files/hunspell_1.7.patch b/srcpkgs/emacs/patches/hunspell_1.7.patch
similarity index 89%
rename from srcpkgs/emacs/files/hunspell_1.7.patch
rename to srcpkgs/emacs/patches/hunspell_1.7.patch
index 1b36605b0b..221ae93938 100644
--- a/srcpkgs/emacs/files/hunspell_1.7.patch
+++ b/srcpkgs/emacs/patches/hunspell_1.7.patch
@@ -1,5 +1,5 @@
---- a/lisp/textmodes/ispell.el
-+++ b/lisp/textmodes/ispell.el
+--- lisp/textmodes/ispell.el
++++ lisp/textmodes/ispell.el
 @@ -1113,7 +1113,12 @@ dictionary from that list was found."
  				 null-device
  				 t
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 5bf8225b7a..ce5b7d8720 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,9 +1,12 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=26.1
-revision=3
-nocross=yes
-nopie=yes
+revision=4
+build_style="gnu-configure"
+configure_args="--with-file-notification=inotify --with-modules
+ $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
+ $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
+ $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)"
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
@@ -13,18 +16,15 @@ makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
  $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
  $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)"
 depends="emacs-common-${version}_${revision}"
-replaces="emacs>=0"
-build_style="gnu-configure"
-configure_args="--with-file-notification=inotify --with-modules
- $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
- $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
- $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)"
 short_desc="GNU Emacs editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/emacs/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
+replaces="emacs>=0"
+nocross=yes
+nopie=yes
 
 # Package build options
 build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n"