diff --git a/js/app/App.js b/js/app/App.js
index 2e2ab6595..e0e24281c 100644
--- a/js/app/App.js
+++ b/js/app/App.js
@@ -44,7 +44,7 @@ var app = angular.module('Deck', [
 	'ui.router',
 	'ui.select',
 	'as.sortable',
-	'markdown',
+	'mdMarkdownIt',
 	'ngAnimate'
 ]);
 
diff --git a/js/app/Config.js b/js/app/Config.js
index 820f2a254..7e74fb27f 100644
--- a/js/app/Config.js
+++ b/js/app/Config.js
@@ -20,21 +20,18 @@
  *  
  */
 
-app.config(function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownProvider) {
+app.config(function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) {
     'use strict';
     $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
 
-
-    markdownProvider.config({
-        simplifiedAutoLink: true,
-        strikethrough: true,
-        tables: true,
-        tasklists: true
-
-    });
-
     $compileProvider.debugInfoEnabled(true);
 
+    markdownItConverterProvider.config({
+        breaks: true,
+        linkify: true,
+        xhtmlOut: true
+    });
+
     $urlRouterProvider.otherwise("/");
 
     $stateProvider
diff --git a/js/bower.json b/js/bower.json
index 7a294d0f7..cd69efdc1 100644
--- a/js/bower.json
+++ b/js/bower.json
@@ -14,8 +14,8 @@
     "es6-shim": "~0.*",
     "js-url": "~2.*",
     "masonry": "~4.0.0",
-    "showdown": "~1.4.2",
-    "angular-ui-select": "~0.18.0"
+    "angular-ui-select": "~0.18.0",
+    "angular-markdown-it": "~0.6.1"
   },
   "license": "AGPL-3.0",
   "private": true,
diff --git a/js/public/app.js b/js/public/app.js
index 44e2613b0..45908bd3c 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -23,26 +23,23 @@ var app = angular.module('Deck', [
 	'ui.router',
 	'ui.select',
 	'as.sortable',
-	'markdown',
+	'mdMarkdownIt',
 	'ngAnimate'
 ]);
 
 
-app.config(["$provide", "$routeProvider", "$interpolateProvider", "$httpProvider", "$urlRouterProvider", "$stateProvider", "$compileProvider", "markdownProvider", function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownProvider) {
+app.config(["$provide", "$routeProvider", "$interpolateProvider", "$httpProvider", "$urlRouterProvider", "$stateProvider", "$compileProvider", "markdownItConverterProvider", function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) {
     'use strict';
     $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
 
-
-    markdownProvider.config({
-        simplifiedAutoLink: true,
-        strikethrough: true,
-        tables: true,
-        tasklists: true
-
-    });
-
     $compileProvider.debugInfoEnabled(true);
 
+    markdownItConverterProvider.config({
+        breaks: true,
+        linkify: true,
+        xhtmlOut: true
+    });
+
     $urlRouterProvider.otherwise("/");
 
     $stateProvider
diff --git a/templates/main.php b/templates/main.php
index d68c08f16..cd33f1173 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -33,7 +33,8 @@ Util::addScript('deck', 'vendor/angular-animate/angular-animate.min');
 Util::addScript('deck', 'vendor/angular-ui-router/release/angular-ui-router.min');
 Util::addScript('deck', 'vendor/ng-sortable/dist/ng-sortable.min');
 Util::addScript('deck', 'vendor/angular-ui-select/dist/select.min');
-Util::addScript('deck', 'vendor/showdown/dist/showdown.min');
+Util::addScript('deck', 'vendor/markdown-it/dist/markdown-it.min');
+Util::addScript('deck', 'vendor/angular-markdown-it/dist/ng-markdownit.min');
 Util::addScript('deck', 'public/app');
 
 ?>
diff --git a/templates/part.card.php b/templates/part.card.php
index 4fc98bf10..47b5d4a73 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -73,7 +73,7 @@
 				  autofocus-on-insert> </textarea>
 		<div class="container" ng-click="cardEditDescriptionShow()"
 			 ng-if="!status.cardEditDescription" ng-animate>
-			<div ng-bind-html="cardservice.getCurrent().description | markdown"
+			<div markdown-it="cardservice.getCurrent().description"
 				 id="markdown"></div>
 			<div class="placeholder"
 				 ng-if="!cardservice.getCurrent().description"><?php p($l->t('Add a card description ...')); ?></div>