diff --git a/doc-src/HAML_CHANGELOG.md b/doc-src/HAML_CHANGELOG.md
index 39f8746c..49fe44b5 100644
--- a/doc-src/HAML_CHANGELOG.md
+++ b/doc-src/HAML_CHANGELOG.md
@@ -252,6 +252,11 @@ that surrounds the filtered text with `<style>` and CDATA tags.
 * The `puts` helper has been removed.
   Use {Haml::Helpers#haml\_concat} instead.
 
+## 2.2.22 (Unreleased)
+
+* Add a railtie so Haml and Sass will be automatically loaded in Rails 3.
+  Thanks to [Daniel Neighman](http://pancakestacks.wordpress.com/).
+
 ## 2.2.21
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
index c8e4da91..1a4722f0 100644
--- a/doc-src/SASS_CHANGELOG.md
+++ b/doc-src/SASS_CHANGELOG.md
@@ -230,6 +230,11 @@ Several bug fixes and minor improvements have been made, including:
   and `tealbang(12)` now renders as `tealbang(12)`
   rather than `teal bang(12)`.
 
+## 2.2.22 (Unreleased)
+
+* Add a railtie so Haml and Sass will be automatically loaded in Rails 3.
+  Thanks to [Daniel Neighman](http://pancakestacks.wordpress.com/).
+
 ## 2.2.21
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
diff --git a/lib/haml.rb b/lib/haml.rb
index 6dbc5ff5..b5213b9c 100644
--- a/lib/haml.rb
+++ b/lib/haml.rb
@@ -38,3 +38,4 @@ end
 
 require 'haml/util'
 require 'haml/engine'
+require 'haml/railtie'
diff --git a/lib/haml/railtie.rb b/lib/haml/railtie.rb
new file mode 100644
index 00000000..6fe4d9a4
--- /dev/null
+++ b/lib/haml/railtie.rb
@@ -0,0 +1,14 @@
+# This file is here to integrate with Rails 3,
+# since there's no better way to do so as of 14 March 2010.
+# Yehuda promises there will be soon,
+# and once there is we should switch to that.
+
+if defined?(Rails::Railtie)
+  module Haml
+    class Railtie < Rails::Railtie
+      initializer :haml do
+        Haml.init_rails(binding)
+      end
+    end
+  end
+end