diff --git a/var/spack/repos/builtin/packages/capstone/package.py b/var/spack/repos/builtin/packages/capstone/package.py
index 2d51c4eea5..734fd80449 100644
--- a/var/spack/repos/builtin/packages/capstone/package.py
+++ b/var/spack/repos/builtin/packages/capstone/package.py
@@ -11,10 +11,9 @@ class Capstone(CMakePackage):
        multi-architecture disassembly framework."""
 
     homepage = "https://www.capstone-engine.org/"
-    url      = "https://github.com/aquynh/capstone/archive/4.0.1.tar.gz"
-    git      = "https://github.com/aquynh/capstone.git"
+    url      = "https://github.com/capstone-engine/capstone/archive/4.0.1.tar.gz"
+    git      = "https://github.com/capstone-engine/capstone.git"
 
     version('next', branch='next')
-    version('master', branch='master')
     version('4.0.2', sha256='7c81d798022f81e7507f1a60d6817f63aa76e489aa4e7055255f21a22f5e526a')
     version('4.0.1', sha256='79bbea8dbe466bd7d051e037db5961fdb34f67c9fac5c3471dd105cfb1e05dc7')