diff --git a/.gitmodules b/.gitmodules
index acb1dc52..d2f73188 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
 [submodule "support/cockpit"]
 	path = support/cockpit
 	url = git://github.com/ajaxorg/cockpit.git
+[submodule "support/pilot"]
+	path = support/pilot
+	url = git://github.com/ajaxorg/pilot.git
diff --git a/demo/boot.js b/demo/boot.js
index 36bcb00f..086b59ae 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -40,7 +40,7 @@ var config = {
         demo: "../demo",
         ace: "../lib/ace",
         cockpit: "../support/cockpit/lib/cockpit",
-        pilot: "../support/cockpit/support/pilot/lib/pilot"
+        pilot: "../support/pilot/lib/pilot"
     }
 };
 
diff --git a/support/pilot b/support/pilot
new file mode 160000
index 00000000..27eb198a
--- /dev/null
+++ b/support/pilot
@@ -0,0 +1 @@
+Subproject commit 27eb198a6030eae035bbc56a7806bdbf813cd8c4