diff --git a/LICENSE b/LICENSE
index 7e46864..c8f0852 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013 COSEINC. All Rights Reserved.
+Copyright (c) 2019 Scott Knight
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -10,16 +10,17 @@ list of conditions and the following disclaimer.
 this list of conditions and the following disclaimer in the documentation and/or
 other materials provided with the distribution.
 
-3. The name of the author(s) may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY COSEINC "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index a7bfc03..3e77b41 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ gapstone
 Gapstone is a Go binding for the Capstone disassembly library.
 
 ## CURRENT UPSTREAM VERSION: 4.0.1
-[![Build Status](https://travis-ci.org/bnagy/gapstone.svg?branch=master)](https://travis-ci.org/bnagy/gapstone)
+[![Build Status](https://travis-ci.org/knightsc/gapstone.svg?branch=master)](https://travis-ci.org/knightsc/gapstone)
 
 (head over to the next branch for the newest stuff)
 
@@ -52,12 +52,12 @@ or http://www.capstone-engine.org
 
 Then, assuming you have set up your Go environment according to the docs, just:
 ```bash
-go get -u github.com/bnagy/gapstone
+go get -u github.com/knightsc/gapstone
 ```
 
 Tests are provided. You should probably run them.
 ```
-cd $GOPATH/src/github.com/bnagy/gapstone
+cd $GOPATH/src/github.com/knightsc/gapstone
 go test
 ```
 
@@ -71,7 +71,7 @@ Here's "Hello World":
 package main
 
 import (
-    "github.com/bnagy/gapstone"
+    "github.com/knightsc/gapstone"
     "log"
 )
 
@@ -113,18 +113,9 @@ func main() {
 }
 ```
 
-Autodoc is available at http://godoc.org/github.com/bnagy/gapstone
+Autodoc is available at http://godoc.org/github.com/knightsc/gapstone
 
 Contributing
 ----
 
 If you feel like chipping in, especially with better tests or examples, fork and send me a pull req.
-
-
-```
-Library Author: Nguyen Anh Quynh
-Binding Author: Ben Nagy
-License: BSD style - see LICENSE file for details
-
-(c) 2013 COSEINC. All Rights Reserved.
-```
diff --git a/genspec b/genspec
index 93d82da..30805de 100755
--- a/genspec
+++ b/genspec
@@ -11,17 +11,16 @@ end
 stub = ARGV[0].chomp('/')
 
 commands = [
-	"#{stub}/test_basic > $GOPATH/src/github.com/bnagy/gapstone/test.SPEC",
-	"#{stub}/test_detail > $GOPATH/src/github.com/bnagy/gapstone/test_detail.SPEC",
-	"#{stub}/test_arm > $GOPATH/src/github.com/bnagy/gapstone/arm.SPEC",
-	"#{stub}/test_arm64 > $GOPATH/src/github.com/bnagy/gapstone/arm64.SPEC",
-	# Temporarily disabled. See https://github.com/aquynh/capstone/pull/1365
-	#"#{stub}/test_x86 > $GOPATH/src/github.com/bnagy/gapstone/x86.SPEC",
-	"#{stub}/test_mips > $GOPATH/src/github.com/bnagy/gapstone/mips.SPEC",
-	"#{stub}/test_ppc > $GOPATH/src/github.com/bnagy/gapstone/ppc.SPEC",
-	"#{stub}/test_systemz > $GOPATH/src/github.com/bnagy/gapstone/sysZ.SPEC",
-	"#{stub}/test_sparc > $GOPATH/src/github.com/bnagy/gapstone/sparc.SPEC",
-	"#{stub}/test_xcore > $GOPATH/src/github.com/bnagy/gapstone/xcore.SPEC"
+	"#{stub}/test_basic > $GOPATH/src/github.com/knightsc/gapstone/test.SPEC",
+	"#{stub}/test_detail > $GOPATH/src/github.com/knightsc/gapstone/test_detail.SPEC",
+	"#{stub}/test_arm > $GOPATH/src/github.com/knightsc/gapstone/arm.SPEC",
+	"#{stub}/test_arm64 > $GOPATH/src/github.com/knightsc/gapstone/arm64.SPEC",
+	"#{stub}/test_x86 > $GOPATH/src/github.com/knightsc/gapstone/x86.SPEC",
+	"#{stub}/test_mips > $GOPATH/src/github.com/knightsc/gapstone/mips.SPEC",
+	"#{stub}/test_ppc > $GOPATH/src/github.com/knightsc/gapstone/ppc.SPEC",
+	"#{stub}/test_systemz > $GOPATH/src/github.com/knightsc/gapstone/sysZ.SPEC",
+	"#{stub}/test_sparc > $GOPATH/src/github.com/knightsc/gapstone/sparc.SPEC",
+	"#{stub}/test_xcore > $GOPATH/src/github.com/knightsc/gapstone/xcore.SPEC"
 ]
 
 commands.each {|c|