diff --git a/textproc/ruby-haml/Makefile b/textproc/ruby-haml/Makefile
index 4df922afa56..9cc090a42f3 100644
--- a/textproc/ruby-haml/Makefile
+++ b/textproc/ruby-haml/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2009/01/24 15:19:17 bernd Exp $
+# $OpenBSD: Makefile,v 1.4 2009/05/19 22:41:24 bernd Exp $
 
 COMMENT=		HTML Abstraction Markup Language for Ruby
 
-DISTNAME=		haml-2.0.7
+DISTNAME=		haml-2.0.9
 PKGNAME=		ruby-${DISTNAME}
 CATEGORIES=		textproc
 
diff --git a/textproc/ruby-haml/distinfo b/textproc/ruby-haml/distinfo
index 02bced8ca4c..3cccb42b802 100644
--- a/textproc/ruby-haml/distinfo
+++ b/textproc/ruby-haml/distinfo
@@ -1,5 +1,5 @@
-MD5 (haml-2.0.7.gem) = 9m0b2wTBhkkrDon/d2rzcg==
-RMD160 (haml-2.0.7.gem) = y7fHF9Y8Ypp38wBWsZPFAqOajVY=
-SHA1 (haml-2.0.7.gem) = s3vTdS8XVrVHE4M4w3/3FxGaCEY=
-SHA256 (haml-2.0.7.gem) = D4ruh86hy3H8MaT8Ib5KynUdZOaT71Eu6Iyp1YBwDXA=
-SIZE (haml-2.0.7.gem) = 102400
+MD5 (haml-2.0.9.gem) = d8FVx+65IM6He2nBBxdTjQ==
+RMD160 (haml-2.0.9.gem) = wvaOzeLX+bXwrrBIne2aEBrarAQ=
+SHA1 (haml-2.0.9.gem) = UAe9SpCgWnlY3wuW7xkh3Bk6AB8=
+SHA256 (haml-2.0.9.gem) = 4hWKWJhEag1GfGAji6COoekb4JWPTaGWyJ+NHcBIlJw=
+SIZE (haml-2.0.9.gem) = 108032
diff --git a/textproc/ruby-haml/patches/patch-Rakefile b/textproc/ruby-haml/patches/patch-Rakefile
new file mode 100644
index 00000000000..1991d273377
--- /dev/null
+++ b/textproc/ruby-haml/patches/patch-Rakefile
@@ -0,0 +1,31 @@
+$OpenBSD: patch-Rakefile,v 1.1 2009/05/19 22:41:24 bernd Exp $
+
+Remove cruft so the regress tests will run.
+
+--- Rakefile.orig	Thu Jan  1 01:00:00 1970
++++ Rakefile	Wed May 20 00:38:42 2009
+@@ -35,16 +35,7 @@ END
+ # ----- Packaging -----
+ 
+ require 'rake/gempackagetask'
+-load    'haml.gemspec'
+ 
+-Rake::GemPackageTask.new(HAML_GEMSPEC) do |pkg|
+-  if Rake.application.top_level_tasks.include?('release')
+-    pkg.need_tar_gz  = true
+-    pkg.need_tar_bz2 = true
+-    pkg.need_zip     = true
+-  end
+-end
+-
+ task :revision_file do
+   require 'lib/haml'
+ 
+@@ -56,7 +47,6 @@ task :revision_file do
+     File.open('REVISION', 'w') { |f| f.puts "(unknown)" }
+   end
+ end
+-Rake::Task[:package].prerequisites.insert(0, :revision_file)
+ 
+ # We also need to get rid of this file after packaging.
+ at_exit { File.delete('REVISION') rescue nil }
diff --git a/textproc/ruby-haml/pkg/PLIST b/textproc/ruby-haml/pkg/PLIST
index 19620129302..1468af893a9 100644
--- a/textproc/ruby-haml/pkg/PLIST
+++ b/textproc/ruby-haml/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/01/24 15:19:17 bernd Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/05/19 22:41:24 bernd Exp $
 bin/css2sass
 bin/haml
 bin/html2haml
@@ -25,6 +25,7 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Haml/Precompiler.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Haml/SyntaxError.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Haml/Template.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Haml/Util.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Haml/Version.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Merb/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Merb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Merb/Rack.html
@@ -67,6 +68,7 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/haml/template/patch_
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/haml/template/plugin_rb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/haml/template_rb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/haml/util_rb.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/haml/version_rb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/haml_rb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/sass/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/sass/constant/
@@ -115,6 +117,9 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/css2sass
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/html2haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/sass
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/extra/
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/extra/haml-mode.el
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/extra/sass-mode.el
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/init.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/haml/
@@ -135,6 +140,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/haml/template.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/haml/template/patch.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/haml/template/plugin.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/haml/util.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/haml/version.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/sass/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/sass.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/sass/constant/
@@ -184,6 +190,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/nuke_outer_white
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/original_engine.xhtml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/partial_layout.xhtml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/partials.xhtml
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/render_layout.xhtml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/silent_script.xhtml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/standard.xhtml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/results/tag_parsing.xhtml
@@ -200,6 +207,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_av_partial_1.
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_av_partial_1_ugly.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_av_partial_2.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_av_partial_2_ugly.haml
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_layout.erb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_layout_for_partial.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_partial.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/_text_area.haml
@@ -219,6 +227,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/original_engin
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/partial_layout.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/partialize.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/partials.haml
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/render_layout.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/silent_script.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/standard.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/standard_ugly.haml
@@ -227,6 +236,7 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/very_basic.ham
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/haml/templates/whitespace_handling.haml
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/linked_rails.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/sass/
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/sass/css2sass_test.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/sass/engine_test.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/sass/plugin_test.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/sass/results/