diff --git a/dev-util/capstone/capstone-4.0.2.recipe b/dev-libs/capstone/capstone-4.0.2.recipe
similarity index 100%
rename from dev-util/capstone/capstone-4.0.2.recipe
rename to dev-libs/capstone/capstone-4.0.2.recipe
diff --git a/dev-util/capstone/capstone5-5.0~rc3.recipe b/dev-libs/capstone/capstone5-5.0.1.recipe
similarity index 91%
rename from dev-util/capstone/capstone5-5.0~rc3.recipe
rename to dev-libs/capstone/capstone5-5.0.1.recipe
index baaa29692..42a75ef95 100644
--- a/dev-util/capstone/capstone5-5.0~rc3.recipe
+++ b/dev-libs/capstone/capstone5-5.0.1.recipe
@@ -17,10 +17,10 @@ HOMEPAGE="http://www.capstone-engine.org"
 COPYRIGHT="2013-2020 COSEINC"
 LICENSE="BSD (3-clause)"
 REVISION="1"
-SOURCE_URI="https://github.com/capstone-engine/capstone/archive/refs/tags/${portVersion/\~/-}.tar.gz"
-CHECKSUM_SHA256="ec1823481ce8443153485dc6a789f0a2fdc5a4dfce511585c3b045764f53e340"
-SOURCE_FILENAME="capstone-${portVersion/\~/-}.tar.gz"
-SOURCE_DIR="capstone-${portVersion/\~/-}"
+SOURCE_URI="https://github.com/capstone-engine/capstone/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="2b9c66915923fdc42e0e32e2a9d7d83d3534a45bb235e163a70047951890c01a"
+SOURCE_FILENAME="capstone-$portVersion.tar.gz"
+SOURCE_DIR="capstone-$portVersion"
 PATCHES="capstone5-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -78,7 +78,8 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cmake -Bbuild -S. $cmakeDirArgs -DCMAKE_BUILD_TYPE=Release \
+	cmake -Bbuild -S. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DBUILD_SHARED_LIBS=ON
 	make -C build $jobArgs
@@ -111,4 +112,5 @@ TEST()
 {
 	./build/test_basic
 	./build/test_detail
+	./build/test_x86
 }
diff --git a/dev-util/capstone/patches/capstone-4.0.2.patchset b/dev-libs/capstone/patches/capstone-4.0.2.patchset
similarity index 100%
rename from dev-util/capstone/patches/capstone-4.0.2.patchset
rename to dev-libs/capstone/patches/capstone-4.0.2.patchset
diff --git a/dev-util/capstone/patches/capstone5-5.0~rc3.patchset b/dev-libs/capstone/patches/capstone5-5.0.1.patchset
similarity index 94%
rename from dev-util/capstone/patches/capstone5-5.0~rc3.patchset
rename to dev-libs/capstone/patches/capstone5-5.0.1.patchset
index f2b263680..999bcc9d4 100644
--- a/dev-util/capstone/patches/capstone5-5.0~rc3.patchset
+++ b/dev-libs/capstone/patches/capstone5-5.0.1.patchset
@@ -1,4 +1,4 @@
-From 4be90b6bc051b1138356a0d4d95f95794284b10f Mon Sep 17 00:00:00 2001
+From 017eec6bc39e0e76b4b4ee271d04dc6a89869690 Mon Sep 17 00:00:00 2001
 From: Calvin Hill <calvin@hakobaito.co.uk>
 Date: Sun, 13 Jan 2019 00:39:39 +0000
 Subject: Fix build of fuzztests.