diff --git a/NEWS.org b/NEWS.org
index dc3df109691..28248d04cdb 100644
--- a/NEWS.org
+++ b/NEWS.org

@@ -30,9 +30,9 @@

#+begin_src emacs-lisp

(luatex "LuaTeX" "luatex" "lualatex --jobname=%(s-filename-only)" "luatex")

#+end_src

-- Change default value of ~ConTeXt-Mark-version~ to =LMTX= which is the

- current ConTeXt version. Internally, there is no difference for LMTX

- and Mark IV behavior.

+- Change default value of ~ConTeXt-Mark-version~ to =XL= which is the

+ current ConTeXt version. Internally, there is no difference for Mark

+ XL and Mark IV behavior.

** Fixed

diff --git a/context.el b/context.el
index 555d5ea04ce..5b32c42f9f5 100644
--- a/context.el
+++ b/context.el

@@ -489,13 +489,13 @@ in your init file such as .emacs.d/init.el or .emacs."

ConTeXt-section-section))

;; Define before first use.

-(defcustom ConTeXt-Mark-version "LMTX"

+(defcustom ConTeXt-Mark-version "XL"

"ConTeXt Mark version used for running ConTeXt."

:group 'TeX-command

- :type '(radio (string :tag "LMTX" "LMTX")

+ :type '(radio (string :tag "Mark XL" "XL")

(string :tag "Mark IV" "IV")

(string :tag "Mark II" "II"))

- :safe (lambda (x) (member x '("II" "IV" "LMTX")))

+ :safe (lambda (x) (member x '("II" "IV" "XL")))

:local t

:package-version '(auctex . "14.2.0"))

@@ -1847,15 +1847,15 @@ else. There might be text before point."

"Expand ConTeXt command.

Use `ConTeXt-Mark-version' to choose the command."

(pcase ConTeXt-Mark-version

- ((or "IV" "LMTX") "context")

+ ((or "IV" "XL") "context")

;; In any other case fall back on Mark II.

(_ "texexec")))

(defun ConTeXt-expand-options ()

"Expand options for context command."

(pcase ConTeXt-Mark-version

- ;; Mark IV or LMTX

- ((or "IV" "LMTX")

+ ;; Mark IV or XL (LMTX)

+ ((or "IV" "XL")

(concat

(if TeX-source-correlate-mode

"--synctex=repeat ")

diff --git a/tex.el b/tex.el
index 138fb53ec3d..069b76c9f5c 100644
--- a/tex.el
+++ b/tex.el

@@ -8606,7 +8606,7 @@ Return nil only if no errors were found."

(cond

((and (string-match "ConTeXt" name) (boundp 'ConTeXt-Mark-version)

(with-current-buffer TeX-command-buffer

- (member ConTeXt-Mark-version '("IV" "LMTX"))))

+ (member ConTeXt-Mark-version '("IV" "XL"))))

(when (re-search-backward " > result saved in file: \\(.*?\\), " nil t)

(let ((output-file (TeX-match-buffer 1)))

;; Shave off quotation marks if present.