diff --git a/.gitmodules b/.gitmodules
index c1f70468..7c23c3b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "lib/ds-test"]
 	path = lib/ds-test
 	url = https://github.com/dapphub/ds-test
-[submodule "lib/ds-token"]
-	path = lib/ds-token
-	url = https://github.com/makerdao/ds-token
 [submodule "lib/ds-value"]
 	path = lib/ds-value
 	url = https://github.com/dapphub/ds-value
+[submodule "lib/ds-token"]
+	path = lib/ds-token
+	url = https://github.com/dapphub/ds-token
diff --git a/lib/ds-test b/lib/ds-test
index eb7148d4..c0b770c0 160000
--- a/lib/ds-test
+++ b/lib/ds-test
@@ -1 +1 @@
-Subproject commit eb7148d43c1ca6f9890361e2e2378364af2430ba
+Subproject commit c0b770c04474db28d43ab4b2fdb891bd21887e9e
diff --git a/lib/ds-token b/lib/ds-token
index ae74f6d0..6eb8a501 160000
--- a/lib/ds-token
+++ b/lib/ds-token
@@ -1 +1 @@
-Subproject commit ae74f6d093ff8e121b706874f97b69b39f1fa5d9
+Subproject commit 6eb8a5010aad2980645c34c49cbfc1e9aea12c32
diff --git a/lib/ds-value b/lib/ds-value
index f3dc6c86..2e3d06ba 160000
--- a/lib/ds-value
+++ b/lib/ds-value
@@ -1 +1 @@
-Subproject commit f3dc6c8656727b74a5469ec2d4cd6851c9db8999
+Subproject commit 2e3d06ba1e96dc531f14d0749fa92146b7390ed8