diff --git a/src/CustomMarkdown.php b/src/CustomMarkdown.php
index 846db8eb..aa92f0b9 100644
--- a/src/CustomMarkdown.php
+++ b/src/CustomMarkdown.php
@@ -1,12 +1,12 @@
 <?php
-class CustomMarkdown extends \Michelf\Markdown
+class CustomMarkdown extends \Michelf\MarkdownExtra
 {
 	protected $simple = false;
 
 	public function __construct($simple = false)
 	{
 		$this->simple = $simple;
-		$this->no_markup = true;
+		$this->no_markup = $simple;
 		$this->span_gamut += ['doSpoilers' => 71];
 		$this->span_gamut += ['doSearchPermalinks' => 72];
 		$this->span_gamut += ['doStrike' => 6];
diff --git a/src/core.php b/src/core.php
index 0f14de9f..c30c82ae 100644
--- a/src/core.php
+++ b/src/core.php
@@ -12,6 +12,7 @@ ini_set('memory_limit', '128M');
 
 //basic include calls, autoloader init
 require_once $rootDir . 'lib' . DS . 'php-markdown' . DS . 'Michelf' . DS . 'Markdown.php';
+require_once $rootDir . 'lib' . DS . 'php-markdown' . DS . 'Michelf' . DS . 'MarkdownExtra.php';
 require_once $rootDir . 'lib' . DS . 'chibi-core' . DS . 'Facade.php';
 \Chibi\AutoLoader::init([__DIR__, $rootDir . 'lib' . DS . 'chibi-sql']);