diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..fe65ad1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/mustache"]
+	path = vendor/mustache
+	url = git://github.com/bobthecow/mustache.php.git
diff --git a/init.php b/init.php
index 17fd57f..876e4b4 100644
--- a/init.php
+++ b/init.php
@@ -1,3 +1,3 @@
 <?php
 
-include Kohana::find_file('vendor', 'Mustache');
\ No newline at end of file
+include Kohana::find_file('vendor', 'mustache/Mustache');
diff --git a/vendor/mustache b/vendor/mustache
new file mode 160000
index 0000000..f6c4473
--- /dev/null
+++ b/vendor/mustache
@@ -0,0 +1 @@
+Subproject commit f6c447385f8709c68ef5c83e926359803784e33e