diff --git a/assets/scss/base/_tables.scss b/assets/scss/base/_tables.scss
index f056b82c30..7cf367d4df 100644
--- a/assets/scss/base/_tables.scss
+++ b/assets/scss/base/_tables.scss
@@ -1,3 +1,8 @@
+.table-wrapper {
+    max-width: 100%;
+    overflow: auto;
+}
+
 table {
     margin: 15px 0;
     border-top: 1px solid #DDD;
diff --git a/assets/scss/layout/_content.scss b/assets/scss/layout/_content.scss
index 614fceb9d8..3fa1978e4e 100644
--- a/assets/scss/layout/_content.scss
+++ b/assets/scss/layout/_content.scss
@@ -317,9 +317,14 @@
             padding: 0 5px;
         }
 
-        mathjax {
-            font-size: 16px;
-            font-size: 1.6rem;
+        .mathjax-wrapper {
+            max-width: 100%;
+            overflow: auto;
+
+            mathjax {
+                font-size: 16px;
+                font-size: 1.6rem;
+            }
         }
 
         .footnote {
diff --git a/requirements.txt b/requirements.txt
index a29cc0b785..1d5a619d66 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ factory-boy==2.4.1
 pygeoip==0.3.2
 pillow==2.7.0
 gitpython==0.3.5
-https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.4.1-zds.12.zip
+https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.4.zip
 easy-thumbnails==2.2
 
 # Api dependencies
diff --git a/zds/utils/templatetags/emarkdown.py b/zds/utils/templatetags/emarkdown.py
index f21209e1f2..2f4040df13 100644
--- a/zds/utils/templatetags/emarkdown.py
+++ b/zds/utils/templatetags/emarkdown.py
@@ -28,7 +28,7 @@ def get_markdown_instance(inline=False, js_support=False):
     :param bool inline: If `True`, configure parser to parse only inline content.
     :return: A ZMarkdown parser.
     """
-    zdsext = ZdsExtension({'inline': inline, 'emoticons': smileys, 'js_support': js_support})
+    zdsext = ZdsExtension(inline=inline, emoticons=smileys, js_support=js_support)
     # Generate parser
     md = Markdown(
         extensions=(zdsext,),