diff --git a/dev-util/capstone/Manifest b/dev-libs/capstone/Manifest
similarity index 100%
rename from dev-util/capstone/Manifest
rename to dev-libs/capstone/Manifest
diff --git a/dev-util/capstone/capstone-3.0.1.ebuild b/dev-libs/capstone/capstone-3.0.1.ebuild
similarity index 100%
rename from dev-util/capstone/capstone-3.0.1.ebuild
rename to dev-libs/capstone/capstone-3.0.1.ebuild
diff --git a/dev-util/capstone/capstone-3.0.2.ebuild b/dev-libs/capstone/capstone-3.0.2.ebuild
similarity index 100%
rename from dev-util/capstone/capstone-3.0.2.ebuild
rename to dev-libs/capstone/capstone-3.0.2.ebuild
diff --git a/dev-util/capstone/capstone-3.0.3.ebuild b/dev-libs/capstone/capstone-3.0.3.ebuild
similarity index 100%
rename from dev-util/capstone/capstone-3.0.3.ebuild
rename to dev-libs/capstone/capstone-3.0.3.ebuild
diff --git a/dev-util/capstone/capstone-3.0.4.ebuild b/dev-libs/capstone/capstone-3.0.4.ebuild
similarity index 100%
rename from dev-util/capstone/capstone-3.0.4.ebuild
rename to dev-libs/capstone/capstone-3.0.4.ebuild
diff --git a/dev-python/capstone-python/capstone-python-2.1.2.ebuild b/dev-python/capstone-python/capstone-python-2.1.2.ebuild
index 4228c3133..be27ad142 100644
--- a/dev-python/capstone-python/capstone-python-2.1.2.ebuild
+++ b/dev-python/capstone-python/capstone-python-2.1.2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cython"
 
 RDEPEND="cython? ( dev-python/cython
-	dev-util/capstone[python] )"
+	dev-libs/capstone[python] )"
 DEPEND=""
 
 S=${WORKDIR}/${MY_P}/bindings/python
diff --git a/dev-python/capstone-python/capstone-python-3.0.4.ebuild b/dev-python/capstone-python/capstone-python-3.0.4.ebuild
index dcea060ec..9d9e86da7 100644
--- a/dev-python/capstone-python/capstone-python-3.0.4.ebuild
+++ b/dev-python/capstone-python/capstone-python-3.0.4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cython"
 
 RDEPEND="cython? ( dev-python/cython
-	dev-util/capstone[python] )"
+	dev-libs/capstone[python] )"
 DEPEND=""
 
 S=${WORKDIR}/${MY_P}/bindings/python
diff --git a/dev-util/radare2/radare2-0.10.1-r1.ebuild b/dev-util/radare2/radare2-0.10.1-r1.ebuild
index 0fb2c56fe..43de62ce3 100644
--- a/dev-util/radare2/radare2-0.10.1-r1.ebuild
+++ b/dev-util/radare2/radare2-0.10.1-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+capstone ssl"
 
-RDEPEND="capstone? ( dev-util/capstone:= )
+RDEPEND="capstone? ( dev-libs/capstone:= )
 	ssl? ( dev-libs/openssl:= )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-util/radare2/radare2-0.10.2-r1.ebuild b/dev-util/radare2/radare2-0.10.2-r1.ebuild
index 0fb2c56fe..43de62ce3 100644
--- a/dev-util/radare2/radare2-0.10.2-r1.ebuild
+++ b/dev-util/radare2/radare2-0.10.2-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+capstone ssl"
 
-RDEPEND="capstone? ( dev-util/capstone:= )
+RDEPEND="capstone? ( dev-libs/capstone:= )
 	ssl? ( dev-libs/openssl:= )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-util/radare2/radare2-0.9.9-r1.ebuild b/dev-util/radare2/radare2-0.9.9-r1.ebuild
index 45fdf1d02..85a0dfe45 100644
--- a/dev-util/radare2/radare2-0.9.9-r1.ebuild
+++ b/dev-util/radare2/radare2-0.9.9-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+capstone debug ssl"
 
-RDEPEND="capstone? ( >dev-util/capstone-2.1.2:= )
+RDEPEND="capstone? ( >dev-libs/capstone-2.1.2:= )
 	!dev-util/radare2-capstone
 	ssl? ( dev-libs/openssl:= )"
 DEPEND="${RDEPEND}
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
new file mode 100644
index 000000000..601201562
--- /dev/null
+++ b/profiles/updates/3Q-2016
@@ -0,0 +1 @@
+move dev-util/capstone dev-libs/capstone