diff --git a/.gitmodules b/.gitmodules
index 1efe8129..7b062654 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,9 @@
 [submodule "barstools"]
 	path = tools/barstools
 	url = https://github.com/ucb-bar/barstools.git
+[submodule "tools/chisel3"]
+	path = tools/chisel3
+	url = https://github.com/freechipsproject/chisel3.git
+[submodule "tools/firrtl"]
+	path = tools/firrtl
+	url = https://github.com/freechipsproject/firrtl
diff --git a/tools/chisel3 b/tools/chisel3
new file mode 160000
index 00000000..9a0ce227
--- /dev/null
+++ b/tools/chisel3
@@ -0,0 +1 @@
+Subproject commit 9a0ce2272c9d5d0a8bdc90e84269749ce054664d
diff --git a/tools/firrtl b/tools/firrtl
new file mode 160000
index 00000000..2272044c
--- /dev/null
+++ b/tools/firrtl
@@ -0,0 +1 @@
+Subproject commit 2272044c6ab46b5148c39c124e66e1a8e9073a24