diff --git a/lib/markdownj-core-0.4.2-SNAPSHOT.jar b/lib/markdownj-core-0.4.2-SNAPSHOT.jar
new file mode 100644
index 000000000000..cf0392a027b2
Binary files /dev/null and b/lib/markdownj-core-0.4.2-SNAPSHOT.jar differ
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/doc/TaskDocumentationProvider.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/doc/TaskDocumentationProvider.java
index 1b106c642ec3..990e567b6952 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/doc/TaskDocumentationProvider.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/doc/TaskDocumentationProvider.java
@@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
 import com.intellij.tasks.Comment;
 import com.intellij.tasks.Task;
+import com.petebevin.markdown.MarkdownProcessor;
 
 import java.util.Collections;
 import java.util.List;
@@ -57,7 +58,8 @@ public class TaskDocumentationProvider extends AbstractDocumentationProvider imp
     }
     final String description = task.getDescription();
     if (description != null) {
-      builder.append("<b>Description:</b><br>").append(description.replace("\n", "<br>"));
+      final MarkdownProcessor processor = new MarkdownProcessor();
+      builder.append("<b>Description:</b><br>").append(processor.markdown(description));
     }
     for (Comment comment : task.getComments()) {
       comment.appendTo(builder);
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubComment.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubComment.java
index 09e170297eef..b6523940f984 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubComment.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubComment.java
@@ -17,6 +17,7 @@ package com.intellij.tasks.github;
 
 import com.intellij.tasks.impl.SimpleComment;
 import com.intellij.util.text.DateFormatUtil;
+import com.petebevin.markdown.MarkdownProcessor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -50,6 +51,6 @@ public class GitHubComment extends SimpleComment {
     }
     builder.append("</td></tr></table>");
 
-    builder.append(getText().replace("\n", "<br>")).append("<br>");
+    builder.append(new MarkdownProcessor().markdown(getText())).append("<br>");
   }
 }