diff --git a/.hunspell.en.dic b/.hunspell.en.dic
index e41889a1..06db9a42 100644
--- a/.hunspell.en.dic
+++ b/.hunspell.en.dic
@@ -1240,3 +1240,4 @@ haveDynamicMPATH
 settarg
 ACTIONs
 arg2
+emacsdatadir
diff --git a/Makefile b/Makefile
index 693f130a..148dcd37 100644
--- a/Makefile
+++ b/Makefile
@@ -723,6 +723,10 @@ ifeq ($(vimaddons),y)
 	$(INSTALL_DATA) share/vim/ftplugin/modulefile.vim '$(DESTDIR)$(vimdatadir)/ftplugin'
 	$(INSTALL_DATA) share/vim/syntax/modulefile.vim '$(DESTDIR)$(vimdatadir)/syntax'
 endif
+ifeq ($(emacsaddons),y)
+	$(INSTALL_DIR) '$(DESTDIR)$(emacsdatadir)'
+	$(INSTALL_DATA) share/emacs/lisp/modulefile-mode.el* '$(DESTDIR)$(emacsdatadir)'
+endif
 ifeq ($(nagelfaraddons),y)
 	$(INSTALL_DIR) '$(DESTDIR)$(nagelfardatadir)'
 	$(INSTALL_DATA) share/nagelfar/plugin_modulecache.tcl  '$(DESTDIR)$(nagelfardatadir)/'
@@ -769,6 +773,11 @@ ifeq ($(vimaddons),y)
 	-rmdir '$(DESTDIR)$(vimdatadir)/syntax'
 	-rmdir -p '$(DESTDIR)$(vimdatadir)'
 endif
+ifeq ($(emacsaddons),y)
+	rm -f '$(DESTDIR)$(emacsdatadir)/modulefile-mode.el'
+	rm -f '$(DESTDIR)$(emacsdatadir)/modulefile-mode.elc'
+	-rmdir -p '$(DESTDIR)$(emacsdatadir)'
+endif
 ifeq ($(nagelfaraddons),y)
 	rm -f '$(DESTDIR)$(nagelfardatadir)/plugin_modulecache.tcl'
 	rm -f '$(DESTDIR)$(nagelfardatadir)/plugin_modulefile.tcl'
diff --git a/Makefile.inc.in b/Makefile.inc.in
index 187c1dd3..7d429b0c 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -14,6 +14,7 @@ datarootdir := @datarootdir@
 mandir := @mandir@
 docdir := @docdir@
 vimdatadir := @vimdatadir@
+emacsdatadir := @emacsdatadir@
 nagelfardatadir := @nagelfardatadir@
 moduleshome := @moduleshome@
 
@@ -52,6 +53,7 @@ appendbinpath := @appendbinpath@
 setmodulespath := @setmodulespath@
 docinstall := @docinstall@
 vimaddons  := @vimaddons@
+emacsaddons  := @emacsaddons@
 examplemodulefiles := @examplemodulefiles@
 
 # where to install init config files
diff --git a/configure b/configure
index 2aee1c05..d187ee5e 100755
--- a/configure
+++ b/configure
@@ -40,7 +40,8 @@ tagcolorname mcookieversioncheck availoutput availterseoutput listoutput \
 listterseoutput editor variantshortcut bashcompletiondir fishcompletiondir \
 zshcompletiondir tcllinter tcllinteropts nagelfardatadir nagelfaraddons \
 stickypurge uniquenameloaded abortonerror sourcecache logger loggeropts \
-loggedevents conflictunload spideroutput spiderterseoutput spiderindepth"
+loggedevents conflictunload spideroutput spiderterseoutput spiderindepth \
+emacsdatadir emacsaddons"
 libarglist=()
 
 # flags to know if argument has been specified on command-line
@@ -56,6 +57,7 @@ appendbinpath=n
 setmodulespath=n
 docinstall=y
 vimaddons=y
+emacsaddons=y
 examplemodulefiles=y
 libtclenvmodules=y
 SHLIB_SUFFIX='.so'
@@ -119,6 +121,7 @@ datarootdir=
 mandir=
 docdir=
 vimdatadir=
+emacsdatadir=
 nagelfardatadir=
 modulefilesdir=
 moduleshome=
@@ -224,6 +227,7 @@ Fine tuning of the installation directories:
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --docdir=DIR            documentation root [DATAROOTDIR/doc]
   --vimdatadir=DIR        Vim addons directory [DATAROOTDIR/vim/vimfiles]
+  --emacsdatadir=DIR      Emacs addons directory [DATAROOTDIR/emacs/lisp]
   --nagelfardatadir=DIR   Nagelfar addons directory [DATAROOTDIR/nagelfar]
   --modulefilesdir=DIR    system modulefiles [PREFIX/modulefiles]
 
@@ -244,6 +248,8 @@ Optional Features:
                           man pages installation) [yes]
   --enable-vim-addons     install Vim addon files in the directory defined
                           with \'vimdatadir' [yes]
+  --enable-emacs-addons   install Emacs addon files in the directory defined
+                          with \'emacsdatadir' [yes]
   --enable-nagelfar-addons
                           install Nagelfar addon files in the directory
                           defined with \'nagelfardatadir' [yes]
@@ -508,6 +514,8 @@ placed in the following directory structure:
     libexec/
     share/
       doc/
+      emacs/
+        lisp/
       man/
         man1/
         man5/
@@ -686,6 +694,10 @@ for arg in "$@"; do
       vimdatadir="${arg#*=}" ;;
    --vimdatadir)
       nextargisval=vimdatadir ;;
+   --emacsdatadir=*)
+      emacsdatadir="${arg#*=}" ;;
+   --emacsdatadir)
+      nextargisval=emacsdatadir ;;
    --nagelfardatadir=*)
       nagelfardatadir="${arg#*=}" ;;
    --nagelfardatadir)
@@ -714,6 +726,9 @@ for arg in "$@"; do
    --enable-vim-addons*|--disable-vim-addons)
       # shellcheck disable=SC2034
       vimaddons=$(get_feature_value "$arg") ;;
+   --enable-emacs-addons*|--disable-emacs-addons)
+      # shellcheck disable=SC2034
+      emacsaddons=$(get_feature_value "$arg") ;;
    --enable-nagelfar-addons*|--disable-nagelfar-addons)
       # shellcheck disable=SC2034
       nagelfaraddons=$(get_feature_value "$arg") ;;
@@ -1169,6 +1184,7 @@ fi
 [ -z "$mandir" ] && mandir=$datarootdir/man
 [ -z "$docdir" ] && docdir=$datarootdir/doc
 [ -z "$vimdatadir" ] && vimdatadir=$datarootdir/vim/vimfiles
+[ -z "$emacsdatadir" ] && emacsdatadir=$datarootdir/emacs/lisp
 [ -z "$nagelfardatadir" ] && nagelfardatadir=$datarootdir/nagelfar
 [ -z "$modulefilesdir" ] && modulefilesdir=$prefix/modulefiles
 [ -z "$moduleshome" ] && moduleshome=$prefix