diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 37f89f5cf..136e6eecb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -131,7 +131,6 @@ jobs:
           cmake:p
           make:p
           ccache:p
-          capstone:p
           glfw:p
           file:p
           mbedtls:p
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 92c44cb26..2f83611bd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/external/capstone" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/external/curl" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/external/fmt" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/external/nativefiledialog" vcs="Git" />
diff --git a/dist/Brewfile b/dist/Brewfile
index a2bc5b94e..c954bf915 100644
--- a/dist/Brewfile
+++ b/dist/Brewfile
@@ -1,6 +1,5 @@
 brew "glfw3"
 brew "mbedtls"
-brew "capstone"
 brew "nlohmann-json"
 brew "cmake"
 brew "ccache"
diff --git a/dist/Dockerfile b/dist/Dockerfile
index 6e6a9d6e2..78e6e30f3 100644
--- a/dist/Dockerfile
+++ b/dist/Dockerfile
@@ -13,7 +13,6 @@ RUN pacman -S --needed --noconfirm      \
     glfw-x11                            \
     file                                \
     mbedtls                             \
-    capstone                            \
     python3                             \
     freetype2                           \
     gtk3
diff --git a/dist/ImHex-9999.ebuild b/dist/ImHex-9999.ebuild
index 64e7edfc7..f36409994 100644
--- a/dist/ImHex-9999.ebuild
+++ b/dist/ImHex-9999.ebuild
@@ -26,7 +26,6 @@ RDEPEND="${DEPEND}
 		media-libs/glfw
 		sys-apps/file
 		dev-libs/mbedtls
-		dev-libs/capstone
 		dev-cpp/nlohmann_json
 		x11-libs/gtk+
 		"
diff --git a/dist/get_deps_archlinux.sh b/dist/get_deps_archlinux.sh
index a0c172eac..ad71417bb 100755
--- a/dist/get_deps_archlinux.sh
+++ b/dist/get_deps_archlinux.sh
@@ -6,7 +6,6 @@ pacman -S --needed \
   glfw \
   file \
   mbedtls \
-  capstone \
   python3 \
   freetype2 \
   gtk3
diff --git a/dist/get_deps_debian.sh b/dist/get_deps_debian.sh
index 6c1c504fd..873dc6389 100755
--- a/dist/get_deps_debian.sh
+++ b/dist/get_deps_debian.sh
@@ -22,7 +22,6 @@ apt install -y \
   libglm-dev            \
   libmagic-dev          \
   libmbedtls-dev        \
-  libcapstone-dev       \
   python3-dev           \
   libfreetype-dev       \
   libgtk-3-dev          \
diff --git a/dist/get_deps_fedora.sh b/dist/get_deps_fedora.sh
index 708016ce7..ad81e9a55 100755
--- a/dist/get_deps_fedora.sh
+++ b/dist/get_deps_fedora.sh
@@ -3,7 +3,6 @@
 dnf install \
   cmake \
   gcc-c++ \
-  capstone-devel \
   file-devel \
   glfw-devel \
   mesa-libGL-devel \
diff --git a/dist/get_deps_msys2.sh b/dist/get_deps_msys2.sh
index 70b286f75..634a9388e 100755
--- a/dist/get_deps_msys2.sh
+++ b/dist/get_deps_msys2.sh
@@ -5,7 +5,6 @@ pacman -S --needed --noconfirm \
   mingw-w64-x86_64-cmake \
   mingw-w64-x86_64-make \
   mingw-w64-x86_64-ccache \
-  mingw-w64-x86_64-capstone \
   mingw-w64-x86_64-glfw \
   mingw-w64-x86_64-file \
   mingw-w64-x86_64-mbedtls \
diff --git a/dist/msys2/PKGBUILD b/dist/msys2/PKGBUILD
index ce7688aca..4a6c6e955 100644
--- a/dist/msys2/PKGBUILD
+++ b/dist/msys2/PKGBUILD
@@ -12,7 +12,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-make"
              "${MINGW_PACKAGE_PREFIX}-dlfcn"
-             "${MINGW_PACKAGE_PREFIX}-capstone"
              "${MINGW_PACKAGE_PREFIX}-glfw"
              "${MINGW_PACKAGE_PREFIX}-file"
              "${MINGW_PACKAGE_PREFIX}-mbedtls"
diff --git a/dist/net.werwolv.ImHex.yaml b/dist/net.werwolv.ImHex.yaml
index e685e7a25..dc26f711a 100644
--- a/dist/net.werwolv.ImHex.yaml
+++ b/dist/net.werwolv.ImHex.yaml
@@ -12,16 +12,6 @@ finish-args:
   - --device=all
 
 modules:
-  - name: capstone
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-    sources:
-      - type: archive
-        url: https://github.com/aquynh/capstone/archive/4.0.2.tar.gz
-        sha256: 7c81d798022f81e7507f1a60d6817f63aa76e489aa4e7055255f21a22f5e526a
-
   - name: libiconv
     sources:
       - type: archive
@@ -64,7 +54,7 @@ modules:
         sha256: 4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b
 
   - name: imhex
-    buildsystem: cmake-ninja
+    buildsystem: cmake
 
     sources:
       - type: git
diff --git a/plugins/builtin/CMakeLists.txt b/plugins/builtin/CMakeLists.txt
index 65a9264bf..546e091bd 100644
--- a/plugins/builtin/CMakeLists.txt
+++ b/plugins/builtin/CMakeLists.txt
@@ -54,7 +54,7 @@ add_library(${PROJECT_NAME} SHARED
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 
 # Add additional libraries here #
-target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle capstone)
+target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle)
 
 # ---- No need to change anything from here downwards unless you know what you're doing ---- #
 
diff --git a/plugins/libimhex/CMakeLists.txt b/plugins/libimhex/CMakeLists.txt
index 64a5f72ce..92c6df988 100644
--- a/plugins/libimhex/CMakeLists.txt
+++ b/plugins/libimhex/CMakeLists.txt
@@ -60,7 +60,8 @@ if (NOT USE_SYSTEM_CAPSTONE)
     set(CAPSTONE_BUILD_SHARED OFF)
     set(CAPSTONE_BUILD_TESTS OFF)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/capstone ${CMAKE_CURRENT_BINARY_DIR}/external/capstone EXCLUDE_FROM_ALL)
-    set(CAPSTONE_LIBRARIES capstone-static)
+    set(CAPSTONE_LIBRARIES "capstone-static")
+    set(CAPSTONE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../external/capstone/include/capstone)
 else()
     find_package(PkgConfig REQUIRED)
     pkg_search_module(CAPSTONE 4.0.2 REQUIRED capstone)