diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e84c4c1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "util/XKCP"]
+	path = util/XKCP
+	url = https://github.com/XKCP/XKCP.git
diff --git a/package.json b/package.json
index 7bb0432..8ba0037 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
     "coverage": "nyc tape test/index.js",
     "coverage-lcov": "npm run coverage && nyc report -r lcov",
     "install": "npm run rebuild || echo \"Keccak bindings compilation fail. Pure JS implementation will be used.\"",
-    "libkeccak": "./util/libkeccak.sh",
     "lint": "standard",
     "rebuild": "node-gyp rebuild",
     "test": "npm run lint && npm run unit",
diff --git a/test/vectors-sha3.js b/test/vectors-sha3.js
index 378e70f..0fa7d08 100644
--- a/test/vectors-sha3.js
+++ b/test/vectors-sha3.js
@@ -4,7 +4,7 @@ const fs = require('fs')
 
 module.exports = (name, createHash) => {
   for (const hash of ['sha3-224', 'sha3-256', 'sha3-384', 'sha3-512']) {
-    const filename = require.resolve(`../util/KeccakCodePackage/TestVectors/ShortMsgKAT_${hash.toUpperCase()}.txt`)
+    const filename = require.resolve(`../util/XKCP/tests/TestVectors/ShortMsgKAT_${hash.toUpperCase()}.txt`)
     const content = fs.readFileSync(filename, 'utf8')
     const lines = content.split('\n')
 
diff --git a/test/vectors-shake.js b/test/vectors-shake.js
index e7084c3..c2bb1f2 100644
--- a/test/vectors-shake.js
+++ b/test/vectors-shake.js
@@ -4,7 +4,7 @@ const fs = require('fs')
 
 module.exports = (name, createHash) => {
   for (const hash of ['shake128', 'shake256']) {
-    const filename = require.resolve(`../util/KeccakCodePackage/TestVectors/ShortMsgKAT_${hash.toUpperCase()}.txt`)
+    const filename = require.resolve(`../util/XKCP/tests/TestVectors/ShortMsgKAT_${hash.toUpperCase()}.txt`)
     const content = fs.readFileSync(filename, 'utf8')
     const lines = content.split('\n')
 
diff --git a/util/XKCP b/util/XKCP
new file mode 160000
index 0000000..58b20ec
--- /dev/null
+++ b/util/XKCP
@@ -0,0 +1 @@
+Subproject commit 58b20ec99f8a891913d8cf0ea350d05b6fb3ae41