diff --git a/CREDITS.txt b/CREDITS.txt
index 51194d0d6..f45a44093 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -191,11 +191,11 @@ Website:      http://incubator.apache.org/projects/lucene.net.html
 Copyright:    Copyright (c) 2009 Apache Software Foundation
 License:      Apache Software Foundation License 2.0
 
-MarkdownSharp
+Markdig
 -----
-Website:     http://code.google.com/p/markdownsharp/
-Copyright:   Copyright (c) 2009-2011 Jeff Atwood
-License:     MIT
+Website:      https://github.com/lunet-io/markdig
+Copyright:    Copyright (c) 2018-2019, Alexandre Mutel
+License:      BSD 2-Clause
  
 Mono Class Library
 -----
diff --git a/src/Orchard.Web/Modules/Markdown/Markdown.csproj b/src/Orchard.Web/Modules/Markdown/Markdown.csproj
index db9ef3ad2..61a918e69 100644
--- a/src/Orchard.Web/Modules/Markdown/Markdown.csproj
+++ b/src/Orchard.Web/Modules/Markdown/Markdown.csproj
@@ -26,6 +26,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,9 +52,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MarkdownSharp, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\StackExchange.MarkdownSharp.1.5.1.0\lib\net35\MarkdownSharp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Markdig.Signed, Version=0.18.0.0, Culture=neutral, PublicKeyToken=870da25a133885f8, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Markdig.Signed.0.18.0\lib\net40\Markdig.Signed.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
diff --git a/src/Orchard.Web/Modules/Markdown/Services/MarkdownFilter.cs b/src/Orchard.Web/Modules/Markdown/Services/MarkdownFilter.cs
index e65d74eb9..cf5d1db3e 100644
--- a/src/Orchard.Web/Modules/Markdown/Services/MarkdownFilter.cs
+++ b/src/Orchard.Web/Modules/Markdown/Services/MarkdownFilter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Web.ApplicationServices;
 using Orchard.Services;
 
 namespace Markdown.Services {
@@ -12,9 +11,7 @@ namespace Markdown.Services {
             if (string.IsNullOrEmpty(text))
                 return string.Empty;
 
-            var markdown = new MarkdownSharp.Markdown();
-
-            return markdown.Transform(text);
+            return Markdig.Markdown.ToHtml(text);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Orchard.Web/Modules/Markdown/packages.config b/src/Orchard.Web/Modules/Markdown/packages.config
index 6c607bdbf..3f81f03ed 100644
--- a/src/Orchard.Web/Modules/Markdown/packages.config
+++ b/src/Orchard.Web/Modules/Markdown/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Markdig.Signed" version="0.18.0" targetFramework="net452" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
-  <package id="StackExchange.MarkdownSharp" version="1.5.1.0" targetFramework="net452" />
 </packages>
\ No newline at end of file