diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..67ce8401c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/kadira:flow-router"]
+	path = packages/kadira:flow-router
+	url = git@github.com:Serubin/flow-router.git
diff --git a/.meteor/packages b/.meteor/packages
index 32d7389c4..7ede40082 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -50,7 +50,6 @@ arillo:flow-router-helpers
 audit-argument-checks
 kadira:blaze-layout
 kadira:dochead
-kadira:flow-router
 meteorhacks:fast-render
 meteorhacks:picker
 meteorhacks:subs-manager
@@ -76,3 +75,4 @@ templates:tabs
 verron:autosize
 simple:json-routes
 rajit:bootstrap3-datepicker
+kadira:flow-router
diff --git a/packages/kadira:flow-router b/packages/kadira:flow-router
new file mode 160000
index 000000000..997e68035
--- /dev/null
+++ b/packages/kadira:flow-router
@@ -0,0 +1 @@
+Subproject commit 997e6803536523044c6c4a0907952078af2462a8