diff --git a/lib/sass.rb b/lib/sass.rb
new file mode 100644
index 00000000..87ba927f
--- /dev/null
+++ b/lib/sass.rb
@@ -0,0 +1,8 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
+require 'haml'
+
+unless Haml::Util.try_sass
+  load Haml::Util.scope('vendor/sass/lib/sass.rb')
+end
diff --git a/lib/sass/plugin.rb b/lib/sass/plugin.rb
new file mode 100644
index 00000000..aaecf53a
--- /dev/null
+++ b/lib/sass/plugin.rb
@@ -0,0 +1,8 @@
+dir = File.dirname(File.dirname(__FILE__))
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
+require 'haml'
+
+unless Haml::Util.try_sass
+  load Haml::Util.scope('vendor/sass/lib/sass/plugin.rb')
+end
diff --git a/lib/sass/rails2_shim.rb b/lib/sass/rails2_shim.rb
new file mode 100644
index 00000000..ea61cc77
--- /dev/null
+++ b/lib/sass/rails2_shim.rb
@@ -0,0 +1,9 @@
+Haml::Util.try_sass
+Haml::Util.haml_warn(<<WARNING)
+Haml will no longer automatically load Sass in Haml 3.2.0.
+Please add config.gem 'sass' to your environment.rb.
+WARNING
+
+require 'sass'
+require 'sass/plugin'
+
diff --git a/lib/sass/rails3_shim.rb b/lib/sass/rails3_shim.rb
new file mode 100644
index 00000000..b4c371bf
--- /dev/null
+++ b/lib/sass/rails3_shim.rb
@@ -0,0 +1,16 @@
+unless Haml::Util.try_sass
+  # Since Bundler sets up our gem environment,
+  # Sass will only be loadable from gem
+  # if gem "sass" has been set.
+  Haml::Util.haml_warn(<<WARNING)
+Haml will no longer automatically load Sass in Haml 3.2.0.
+Please add gem 'sass' to your Gemfile.
+WARNING
+end
+
+require 'sass/plugin/configuration'
+
+ActiveSupport.on_load(:before_initialize) do
+  require 'sass'
+  require 'sass/plugin'
+end