diff --git a/.gitmodules b/.gitmodules
index abc63826..fa187f7c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "test/haml/spec"]
 	path = test/haml/spec
 	url = git://github.com/norman/haml-spec.git
+[submodule "vendor/fssm"]
+	path = vendor/fssm
+	url = git://github.com/ttilley/fssm
diff --git a/lib/sass.rb b/lib/sass.rb
index c8243796..cce974da 100644
--- a/lib/sass.rb
+++ b/lib/sass.rb
@@ -20,5 +20,9 @@ module Sass
 end
 
 require 'haml/util'
+
+dir = Haml::Util.scope("vendor/fssm/lib")
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
 require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)
diff --git a/vendor/fssm b/vendor/fssm
new file mode 160000
index 00000000..ddfd09d7
--- /dev/null
+++ b/vendor/fssm
@@ -0,0 +1 @@
+Subproject commit ddfd09d76c4a67e20b217db29d285f638ca5b41d