diff --git a/.gitmodules b/.gitmodules
index 0cc7023..c91c805 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "msgpack-d"]
 	path = msgpack-d
 	url = https://github.com/msgpack/msgpack-d.git
+[submodule "dscanner"]
+	path = dscanner
+	url = https://github.com/Hackerpilot/Dscanner.git
diff --git a/build.sh b/build.sh
index 1f3ffd7..499af3a 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,2 @@
 dmd -wi client.d messages.d msgpack-d/src/msgpack.d -Imsgpack-d/src -ofdcd-client
-dmd -wi server.d modulecache.d actypes.d messages.d constants.d acvisitor.d autocomplete.d ../dscanner/stdx/d/ast.d ../dscanner/stdx/d/parser.d ../dscanner/stdx/d/lexer.d ../dscanner/stdx/d/entities.d msgpack-d/src/msgpack.d -Imsgpack-d/src -I../dscanner/ -ofdcd-server
+dmd -wi server.d modulecache.d actypes.d messages.d constants.d acvisitor.d autocomplete.d dscanner/stdx/d/ast.d dscanner/stdx/d/parser.d dscanner/stdx/d/lexer.d dscanner/stdx/d/entities.d msgpack-d/src/msgpack.d -Imsgpack-d/src -Idscanner/ -ofdcd-server
diff --git a/dscanner b/dscanner
new file mode 160000
index 0000000..bace5f0
--- /dev/null
+++ b/dscanner
@@ -0,0 +1 @@
+Subproject commit bace5f0a76e27b4837a49dfba8a8e7c60c6344f3