diff --git a/.gitmodules b/.gitmodules
index b09820de..05af060d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "hx4compat"]
 	path = hx4compat
 	url = https://github.com/HaxeFoundation/hx4compat
+[submodule "crypto"]
+	path = crypto
+	url = https://github.com/HaxeFoundation/crypto
diff --git a/client.hxml b/client.hxml
index ec418226..e5a3ae3c 100644
--- a/client.hxml
+++ b/client.hxml
@@ -1,5 +1,6 @@
 -cp src
 -cp hx3compat/std
 -cp hx4compat/std
+-cp crypto/src
 -neko run.n
 -main haxelib.client.Main
diff --git a/client_legacy.hxml b/client_legacy.hxml
index 7fd2682f..b35394fe 100644
--- a/client_legacy.hxml
+++ b/client_legacy.hxml
@@ -1,5 +1,6 @@
 -cp src
 -cp hx3compat/std
 -cp hx4compat/std
+-cp crypto/src
 -neko bin/legacyhaxelib.n
 -main legacyhaxelib.Main
\ No newline at end of file
diff --git a/client_tests.hxml b/client_tests.hxml
index 17eb010a..38c61023 100644
--- a/client_tests.hxml
+++ b/client_tests.hxml
@@ -2,6 +2,7 @@
 -p test
 -p hx3compat/std
 -p hx4compat/std
+-p crypto/src
 --main HaxelibTests
 --debug
 --neko bin/test.n
diff --git a/crypto b/crypto
new file mode 160000
index 00000000..8d145d2b
--- /dev/null
+++ b/crypto
@@ -0,0 +1 @@
+Subproject commit 8d145d2b5231a7c0089e63f29b65d6cb019a82c5
diff --git a/haxelib.json b/haxelib.json
index 8b909842..f05db1f0 100644
--- a/haxelib.json
+++ b/haxelib.json
@@ -10,6 +10,7 @@
 	"contributors": ["HaxeFoundation", "back2dos", "ncannasse", "jason", "Simn", "nadako", "andyli"],
 	"dependencies":{
 		"hx3compat": "",
-		"hx4compat": ""
+		"hx4compat": "",
+		"crypto": ""
 	}
 }
diff --git a/integration_tests.hxml b/integration_tests.hxml
index 1790ba93..37ab3b6e 100644
--- a/integration_tests.hxml
+++ b/integration_tests.hxml
@@ -2,5 +2,6 @@
 -cp test
 -lib hx3compat
 -cp hx4compat/std
+-cp crypto/src
 -main IntegrationTests
 -neko bin/integration_tests.n
\ No newline at end of file
diff --git a/package.hxml b/package.hxml
index 9ea2e265..0531ad3e 100755
--- a/package.hxml
+++ b/package.hxml
@@ -1,4 +1,5 @@
 -cp src
 -cp hx3compat/std
 -cp hx4compat/std
+-cp crypto/src
 --run Package
\ No newline at end of file
diff --git a/run.n b/run.n
index 5920518d..a469906f 100644
Binary files a/run.n and b/run.n differ
diff --git a/server_each.hxml b/server_each.hxml
index 86745ecc..aac31546 100644
--- a/server_each.hxml
+++ b/server_each.hxml
@@ -1,6 +1,7 @@
 -cp src
 -cp hx3compat/std
 -cp hx4compat/std
+-cp crypto/src
 -lib ufront
 -lib ufront-mail:1.0.0-rc.4
 -lib ufront-ufadmin
diff --git a/server_gitrepo.hxml b/server_gitrepo.hxml
index b04f2cbb..8a93ca92 100644
--- a/server_gitrepo.hxml
+++ b/server_gitrepo.hxml
@@ -3,6 +3,7 @@
 --class-path lib/node-sys-db
 --class-path hx3compat/std
 --class-path hx4compat/std
+--class-path crypto/src
 --library hxnodejs
 --library record-macros
 --js gitrepo.js