diff --git a/assets/css/app.css b/assets/css/app.css
index df4beb182..8bce328d1 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -566,6 +566,23 @@ article .task-score {
     line-height: 1.4em;
 }
 
+.markdown h1 {
+    margin-top: 5px;
+    margin-bottom: 10px;
+    font-size: 2em;
+    padding-bottom: 3px;
+    border-bottom: 1px dotted #000;
+}
+
+.markdown h2 {
+    text-decoration: underline;
+}
+
+.markdown h3 {
+    font-weight: bold;
+    text-decoration: underline;
+}
+
 .markdown ol,
 .markdown ul {
     margin-left: 25px;
diff --git a/templates/task_edit.php b/templates/task_edit.php
index eca4537a7..07555432e 100644
--- a/templates/task_edit.php
+++ b/templates/task_edit.php
@@ -28,7 +28,7 @@
 
         <?= Helper\form_label(t('Description'), 'description') ?>
         <?= Helper\form_textarea('description', $values, $errors) ?><br/>
-        <div class="form-help"><a href="http://en.wikipedia.org/wiki/Markdown#Example" target="_blank"><?= t('Write your text in Markdown') ?></a></div>
+        <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
 
         <?= Helper\form_checkbox('another_task', t('Create another task'), 1) ?>
 
diff --git a/templates/task_new.php b/templates/task_new.php
index 30e97a85b..88ffd53f2 100644
--- a/templates/task_new.php
+++ b/templates/task_new.php
@@ -28,6 +28,7 @@
 
         <?= Helper\form_label(t('Description'), 'description') ?>
         <?= Helper\form_textarea('description', $values, $errors) ?><br/>
+        <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
 
         <?= Helper\form_checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?>
 
diff --git a/templates/task_show.php b/templates/task_show.php
index 59e00b1bc..cc1d9e258 100644
--- a/templates/task_show.php
+++ b/templates/task_show.php
@@ -68,7 +68,7 @@
 
                 <?= Helper\form_hidden('id', $description_form['values']) ?>
                 <?= Helper\form_textarea('description', $description_form['values'], $description_form['errors'], array('required', 'placeholder="'.t('Leave a description').'"')) ?><br/>
-                <div class="form-help"><a href="http://en.wikipedia.org/wiki/Markdown#Example" target="_blank"><?= t('Write your text in Markdown') ?></a></div>
+                <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
 
                 <div class="form-actions">
                     <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
@@ -93,7 +93,7 @@
             <?= Helper\form_hidden('task_id', $comment_form['values']) ?>
             <?= Helper\form_hidden('user_id', $comment_form['values']) ?>
             <?= Helper\form_textarea('comment', $comment_form['values'], $comment_form['errors'], array('required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
-            <div class="form-help"><a href="http://en.wikipedia.org/wiki/Markdown#Example" target="_blank"><?= t('Write your text in Markdown') ?></a></div>
+            <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
 
             <div class="form-actions">
                 <input type="submit" value="<?= t('Post comment') ?>" class="btn btn-blue"/>