diff --git a/.gitmodules b/.gitmodules
index 5c048dda9..7b798103f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -52,6 +52,3 @@
 [submodule "deps/mir-json"]
 	path = deps/mir-json
 	url = https://github.com/GaloisInc/mir-json.git
-[submodule "deps/macaw-loader"]
-	path = deps/macaw-loader
-	url = https://github.com/GaloisInc/macaw-loader.git
diff --git a/cabal.project b/cabal.project
index 92f84bc70..220f25b1c 100644
--- a/cabal.project
+++ b/cabal.project
@@ -37,11 +37,11 @@ packages:
     deps/lmdb/lmdb-simple
     deps/macaw/base
     deps/macaw/macaw-dump
+    deps/macaw/macaw-loader
+    deps/macaw/macaw-loader-x86
     deps/macaw/symbolic
     deps/macaw/x86
     deps/macaw/x86_symbolic
-    deps/macaw-loader/macaw-loader
-    deps/macaw-loader/macaw-loader-x86
     deps/elf-edit
     deps/dwarf
     deps/argo/argo
diff --git a/deps/macaw b/deps/macaw
index a1e36fde2..30f209c2d 160000
--- a/deps/macaw
+++ b/deps/macaw
@@ -1 +1 @@
-Subproject commit a1e36fde2b191128e7361f98df45927fb867bd51
+Subproject commit 30f209c2dd44a691e4277aca344b2c14e9e28428
diff --git a/deps/macaw-loader b/deps/macaw-loader
deleted file mode 160000
index 57ebded95..000000000
--- a/deps/macaw-loader
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57ebded959aea6a28644a278e32c734c9b24e972