diff --git a/mathjax/mathjax.js b/mathjax/mathjax.js
new file mode 100644
index 00000000..686f21bb
--- /dev/null
+++ b/mathjax/mathjax.js
@@ -0,0 +1,5 @@
+Addon_registerHook("postprocess_liveupdate", "mathjax_postprocess_liveupdate");
+function mathjax_postprocess_liveupdate()
+{
+	MathJax.Hub.Queue(["Typeset", MathJax.Hub]);
+}
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 7d1a8134..91a6a066 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -16,13 +16,26 @@ function mathjax_install() {
     Addon::registerHook('page_header', 'addon/mathjax/mathjax.php', 'mathjax_page_header');
     Addon::registerHook('addon_settings', 'addon/mathjax/mathjax.php', 'mathjax_settings');
     Addon::registerHook('addon_settings_post', 'addon/mathjax/mathjax.php', 'mathjax_settings_post');
+    Addon::registerHook('template_vars', 'addon/mathjax/mathjax.php', 'mathjax_template_vars');
     logger('installed js_math addon');
 }
+
 function mathjax_uninstall() {
     Addon::unregisterHook('page_header', 'addon/mathjax/mathjax.php', 'mathjax_page_header');
     Addon::unregisterHook('addon_settings', 'addon/mathjax/mathjax.php', 'mathjax_settings');
     Addon::unregisterHook('addon_settings_post', 'addon/mathjax/mathjax.php', 'mathjax_settings_post');
+    Addon::unregisterHook('template_vars', 'addon/mathjax/mathjax.php', 'mathjax_template_vars');
 }
+
+function mathjax_template_vars($a, &$arr)
+{
+    if (!array_key_exists('addon_hooks',$arr['vars']))
+    {
+	$arr['vars']['addon_hooks'] = array();
+    }
+    $arr['vars']['addon_hooks'][] = "mathjax";
+}
+
 function mathjax_settings_post ($a, $post) {
     if (! local_user())
         return;