diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index afdee4a1d8..8f81b7fd00 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -60,6 +60,7 @@ pre-configure:
 	(cd ${WRKSRC}; ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ./autogen.sh)
 
 .include "../../wip/mk/git-package.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libimagequant/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/emacs-git/PLIST b/emacs-git/PLIST
index f9c52f70e4..194275cda6 100644
--- a/emacs-git/PLIST
+++ b/emacs-git/PLIST
@@ -2964,6 +2964,8 @@ share/emacs/${PKGVERSION}/lisp/obsolete/lucid.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/lucid.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/mailpost.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/mailpost.elc
+share/emacs/${PKGVERSION}/lisp/obsolete/mantemp.el.gz
+share/emacs/${PKGVERSION}/lisp/obsolete/mantemp.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/meese.el.gz
 share/emacs/${PKGVERSION}/lisp/obsolete/meese.elc
 share/emacs/${PKGVERSION}/lisp/obsolete/messcompat.el
@@ -3468,8 +3470,6 @@ share/emacs/${PKGVERSION}/lisp/progmodes/m4-mode.el.gz
 share/emacs/${PKGVERSION}/lisp/progmodes/m4-mode.elc
 share/emacs/${PKGVERSION}/lisp/progmodes/make-mode.el.gz
 share/emacs/${PKGVERSION}/lisp/progmodes/make-mode.elc
-share/emacs/${PKGVERSION}/lisp/progmodes/mantemp.el.gz
-share/emacs/${PKGVERSION}/lisp/progmodes/mantemp.elc
 share/emacs/${PKGVERSION}/lisp/progmodes/meta-mode.el.gz
 share/emacs/${PKGVERSION}/lisp/progmodes/meta-mode.elc
 share/emacs/${PKGVERSION}/lisp/progmodes/mixal-mode.el.gz
diff --git a/emacs-git/options.mk b/emacs-git/options.mk
index 1b5fdde6e1..d4f4345a37 100644
--- a/emacs-git/options.mk
+++ b/emacs-git/options.mk
@@ -2,7 +2,8 @@
 
 ### Set options
 PKG_OPTIONS_VAR=			PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS=			dbus gconf gnutls imagemagick svg xaw3d xft2 xml
+PKG_SUPPORTED_OPTIONS=			dbus gconf gnutls imagemagick jansson svg xaw3d xft2 xml
+PKG_SUGGESTED_OPTIONS=			jansson
 # xaw3d is only valid with tookit = xaw
 
 PKG_OPTIONS_OPTIONAL_GROUPS+=		window-system
@@ -90,6 +91,15 @@ CONFIGURE_ARGS+=	--without-gconf
 CONFIGURE_ARGS+=	--without-imagemagick
 .  endif
 
+###
+### Support jansson (JSON library)
+###
+.  if !empty(PKG_OPTIONS:Mjansson)
+.include "../../textproc/jansson/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--without-json
+.  endif
+
 ###
 ### Support Xaw3d (This is only valid with Lucid Toolkit)
 ###