diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9037c633..45aa52cb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Aseprite
-# Copyright (C) 2018-2020  Igara Studio S.A.
+# Copyright (C) 2018-2021  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 cmake_minimum_required(VERSION 3.4)
@@ -292,8 +292,7 @@ if(USE_SHARED_CMARK)
   find_path(CMARK_INCLUDE_DIRS NAMES cmark.h)
 else()
   add_definitions(-DCMARK_STATIC_DEFINE)
-  set(CMARK_LIBRARIES libcmark_static)
-  include_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/cmark)
+  set(CMARK_LIBRARIES cmark_static)
 endif()
 
 if(REQUIRE_CURL)
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index ffd1c0cfc..d03eb0851 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -1,4 +1,5 @@
-# ASEPRITE
+# Aseprite
+# Copyright (C) 2021  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 include_directories(.)
@@ -84,20 +85,6 @@ add_subdirectory(fmt)
 if(NOT USE_SHARED_CMARK)
   set(CMARK_TESTS OFF CACHE BOOL "Build cmark tests and enable testing")
   add_subdirectory(cmark)
-  set(cmark_headers
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmark/src/cmark.h
-    ${CMAKE_CURRENT_BINARY_DIR}/cmark/src/cmark_export.h
-    ${CMAKE_CURRENT_BINARY_DIR}/cmark/src/cmark_version.h)
-  foreach(fn ${cmark_headers})
-    get_filename_component(fn_name "${fn}" NAME)
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name}
-      COMMAND ${CMAKE_COMMAND} -E copy ${fn} ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name}
-      MAIN_DEPENDENCY ${fn})
-    list(APPEND copy_cmark_headers ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name})
-  endforeach()
-  add_custom_target(copy_cmark_headers DEPENDS ${copy_cmark_headers})
-  add_dependencies(libcmark_static copy_cmark_headers)
 endif()
 
 # JSON
diff --git a/third_party/cmark b/third_party/cmark
index 5255e2d57..8a0232861 160000
--- a/third_party/cmark
+++ b/third_party/cmark
@@ -1 +1 @@
-Subproject commit 5255e2d5717dc7a265ca79404d387ef8abe8c004
+Subproject commit 8a023286198a7e408398e282f293e3b0baebb644