diff --git a/Math.i18n.php b/Math.i18n.php
index b52b26a6c..c77584815 100644
--- a/Math.i18n.php
+++ b/Math.i18n.php
@@ -34,6 +34,7 @@ $messages['en'] = array(
 	'math_bad_tmpdir' => 'Cannot write to or create math temp directory',
 	'math_bad_output' => 'Cannot write to or create math output directory',
 	'math_notexvc' => 'Missing texvc executable; please see math/README to configure.',
+	'math_notexvccheck' => 'Missing texvccheck executable; please see math/README to configure.',
 	'math_output_error' => 'Cannot store math image on filesystem.',
 	'math_latexml_timeout' => 'LaTeXML timeout from \'$1\'',
 	'math_latexml_invalidresponse' => 'LaTeXML Invalid response (\'$2\') from server \'$1\':',
@@ -132,6 +133,9 @@ This message follows the message {{msg-mw|Math failure}}.',
 This message follows the message {{msg-mw|Math failure}}.',
 	'math_notexvc' => 'Used as error message.
 
+This message follows the message {{msg-mw|Math failure}}.',
+	'math_notexvccheck' => 'Used as error message.
+
 This message follows the message {{msg-mw|Math failure}}.',
 	'math_output_error' => 'Used as error message if the texvc output file could not be stored.
 
diff --git a/Math.php b/Math.php
index 6ed0d6c4f..d4c491833 100644
--- a/Math.php
+++ b/Math.php
@@ -132,7 +132,7 @@ $wgMathLaTeXMLTimeout = 240;
  */
 $wgMathDefaultLaTeXMLSetting = 'format=xhtml&whatsin=math&whatsout=math&pmml&cmml&nodefaultresources&preload=LaTeX.pool&preload=article.cls&preload=amsmath.sty&preload=amsthm.sty&preload=amstext.sty&preload=amssymb.sty&preload=eucal.sty&preload=[dvipsnames]xcolor.sty&preload=url.sty&preload=hyperref.sty&preload=[ids]latexml.sty&preload=texvc';
 /**
- * The link to the texvc executable
+ * The link to the texvccheck executable
  */
 $wgMathTexvcCheckExecutable = dirname( __FILE__ ) . '/texvccheck/texvccheck';
 /**
diff --git a/MathInputCheckTexvc.php b/MathInputCheckTexvc.php
index f8b1613e1..36c0ae812 100644
--- a/MathInputCheckTexvc.php
+++ b/MathInputCheckTexvc.php
@@ -59,7 +59,7 @@ class MathInputCheckTexvc extends MathInputCheck {
 	public function doValidCheck() {
 		global $wgMathTexvcCheckExecutable;
 		if ( !is_executable( $wgMathTexvcCheckExecutable ) ) {
-			$msg = wfMessage( 'math_notexvc' )->inContentLanguage()->escaped();
+			$msg = wfMessage( 'math_notexvccheck' )->inContentLanguage()->escaped();
 			trigger_error( $msg, E_USER_NOTICE );
 			wfDebugLog( 'Math', $msg );
 			return true;
diff --git a/README b/README
index b64242ed0..addb24f3a 100644
--- a/README
+++ b/README
@@ -6,11 +6,13 @@ This version (for MediaWiki 1.19) has some changes since previous versions:
 
 See the README in the math subdirectory for more info on setting up the
 low-level conversion tools.
+See the README in the texvccheck subdirectory for more info on setting up the
+security checking tools for MathJax and LaTeXML.
 
 MathML support:
 If you prefer MathML rather than images you can use LaTeXML to convert the
 math tags to MathML. To use that feature you have to enable LaTeXML by setting
-$wgUseLaTeXML = true;
+$wgMathUseLaTeXML = true;
 It is possible to choose LaTeXML as default option (for anonymous user) by setting
 $wgDefaultUserOptions['math'] = MW_MATH_LATEXML;
 in the LocalSettings.php file.