diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index a85b9183121..9ad3577e07b 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=25.3
-revision=1
+revision=2
 nocross=yes
 nopie=yes
 patch_args="-Np1"
@@ -12,14 +12,14 @@ makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkitgtk-devel
  $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
  $(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel)
  $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
- $(vopt_if sound alsa-lib-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 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"
@@ -28,10 +28,11 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b
 
 # Package build options
-build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound"
+build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n"
 desc_option_xpm="Enable support for XPM images"
 desc_option_sound="Enable support for sound"
-build_options_default="jpeg tiff gif png xpm svg xml gnutls sound"
+desc_option_m17n="Enable support for m17n multilingual text processing"
+build_options_default="jpeg tiff gif png xpm svg xml gnutls sound m17n"
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in