diff --git a/textproc/ruby-haml/Makefile b/textproc/ruby-haml/Makefile
index c0983e1dc8f74..84c1b6910108b 100644
--- a/textproc/ruby-haml/Makefile
+++ b/textproc/ruby-haml/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2015/09/13 15:18:07 taca Exp $
+# $NetBSD: Makefile,v 1.18 2017/06/21 14:29:25 taca Exp $
 
-DISTNAME=	haml-4.0.7
+DISTNAME=	haml-5.0.1
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,6 +8,7 @@ HOMEPAGE=	http://haml.info/
 COMMENT=	XHTML & CSS markup language & template engine
 LICENSE=	mit
 
+DEPENDS+=	${RUBY_PKGPREFIX}-temple>=0.8.0:../../textproc/ruby-temple
 DEPENDS+=	${RUBY_PKGPREFIX}-tilt>=0:../../textproc/ruby-tilt
 
 RUBYGEM_OPTIONS+=	--format-executable
diff --git a/textproc/ruby-haml/PLIST b/textproc/ruby-haml/PLIST
index 4e0177216eccf..86aeb771470d1 100644
--- a/textproc/ruby-haml/PLIST
+++ b/textproc/ruby-haml/PLIST
@@ -1,107 +1,62 @@
-@comment $NetBSD: PLIST,v 1.15 2015/09/13 15:18:07 taca Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/06/21 14:29:25 taca Exp $
 bin/haml${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/.gitignore
+${GEM_LIBDIR}/.gitmodules
+${GEM_LIBDIR}/.travis.yml
 ${GEM_LIBDIR}/.yardopts
 ${GEM_LIBDIR}/CHANGELOG.md
 ${GEM_LIBDIR}/FAQ.md
+${GEM_LIBDIR}/Gemfile
 ${GEM_LIBDIR}/MIT-LICENSE
 ${GEM_LIBDIR}/README.md
 ${GEM_LIBDIR}/REFERENCE.md
 ${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/TODO
+${GEM_LIBDIR}/benchmark.rb
 ${GEM_LIBDIR}/bin/haml
+${GEM_LIBDIR}/haml.gemspec
 ${GEM_LIBDIR}/lib/haml.rb
+${GEM_LIBDIR}/lib/haml/.gitattributes
+${GEM_LIBDIR}/lib/haml/attribute_builder.rb
+${GEM_LIBDIR}/lib/haml/attribute_compiler.rb
+${GEM_LIBDIR}/lib/haml/attribute_parser.rb
 ${GEM_LIBDIR}/lib/haml/buffer.rb
 ${GEM_LIBDIR}/lib/haml/compiler.rb
 ${GEM_LIBDIR}/lib/haml/engine.rb
 ${GEM_LIBDIR}/lib/haml/error.rb
+${GEM_LIBDIR}/lib/haml/escapable.rb
 ${GEM_LIBDIR}/lib/haml/exec.rb
 ${GEM_LIBDIR}/lib/haml/filters.rb
+${GEM_LIBDIR}/lib/haml/generator.rb
 ${GEM_LIBDIR}/lib/haml/helpers.rb
 ${GEM_LIBDIR}/lib/haml/helpers/action_view_extensions.rb
 ${GEM_LIBDIR}/lib/haml/helpers/action_view_mods.rb
 ${GEM_LIBDIR}/lib/haml/helpers/action_view_xss_mods.rb
+${GEM_LIBDIR}/lib/haml/helpers/safe_erubi_template.rb
 ${GEM_LIBDIR}/lib/haml/helpers/safe_erubis_template.rb
 ${GEM_LIBDIR}/lib/haml/helpers/xss_mods.rb
 ${GEM_LIBDIR}/lib/haml/options.rb
 ${GEM_LIBDIR}/lib/haml/parser.rb
+${GEM_LIBDIR}/lib/haml/plugin.rb
 ${GEM_LIBDIR}/lib/haml/railtie.rb
 ${GEM_LIBDIR}/lib/haml/sass_rails_filter.rb
 ${GEM_LIBDIR}/lib/haml/template.rb
 ${GEM_LIBDIR}/lib/haml/template/options.rb
-${GEM_LIBDIR}/lib/haml/template/plugin.rb
+${GEM_LIBDIR}/lib/haml/temple_engine.rb
+${GEM_LIBDIR}/lib/haml/temple_line_counter.rb
 ${GEM_LIBDIR}/lib/haml/util.rb
 ${GEM_LIBDIR}/lib/haml/version.rb
+${GEM_LIBDIR}/test/attribute_parser_test.rb
 ${GEM_LIBDIR}/test/engine_test.rb
-${GEM_LIBDIR}/test/erb/_av_partial_1.erb
-${GEM_LIBDIR}/test/erb/_av_partial_2.erb
-${GEM_LIBDIR}/test/erb/action_view.erb
-${GEM_LIBDIR}/test/erb/standard.erb
 ${GEM_LIBDIR}/test/filters_test.rb
-${GEM_LIBDIR}/test/gemfiles/Gemfile.rails-3.0.x
-${GEM_LIBDIR}/test/gemfiles/Gemfile.rails-3.1.x
-${GEM_LIBDIR}/test/gemfiles/Gemfile.rails-3.2.x
-${GEM_LIBDIR}/test/gemfiles/Gemfile.rails-4.0.x
-${GEM_LIBDIR}/test/haml-spec/LICENSE
-${GEM_LIBDIR}/test/haml-spec/README.md
-${GEM_LIBDIR}/test/haml-spec/lua_haml_spec.lua
-${GEM_LIBDIR}/test/haml-spec/perl_haml_test.pl
-${GEM_LIBDIR}/test/haml-spec/ruby_haml_test.rb
-${GEM_LIBDIR}/test/haml-spec/tests.json
 ${GEM_LIBDIR}/test/helper_test.rb
-${GEM_LIBDIR}/test/markaby/standard.mab
-${GEM_LIBDIR}/test/mocks/article.rb
+${GEM_LIBDIR}/test/options_test.rb
 ${GEM_LIBDIR}/test/parser_test.rb
-${GEM_LIBDIR}/test/results/content_for_layout.xhtml
-${GEM_LIBDIR}/test/results/eval_suppressed.xhtml
-${GEM_LIBDIR}/test/results/helpers.xhtml
-${GEM_LIBDIR}/test/results/helpful.xhtml
-${GEM_LIBDIR}/test/results/just_stuff.xhtml
-${GEM_LIBDIR}/test/results/list.xhtml
-${GEM_LIBDIR}/test/results/nuke_inner_whitespace.xhtml
-${GEM_LIBDIR}/test/results/nuke_outer_whitespace.xhtml
-${GEM_LIBDIR}/test/results/original_engine.xhtml
-${GEM_LIBDIR}/test/results/partial_layout.xhtml
-${GEM_LIBDIR}/test/results/partial_layout_erb.xhtml
-${GEM_LIBDIR}/test/results/partials.xhtml
-${GEM_LIBDIR}/test/results/render_layout.xhtml
-${GEM_LIBDIR}/test/results/silent_script.xhtml
-${GEM_LIBDIR}/test/results/standard.xhtml
-${GEM_LIBDIR}/test/results/tag_parsing.xhtml
-${GEM_LIBDIR}/test/results/very_basic.xhtml
-${GEM_LIBDIR}/test/results/whitespace_handling.xhtml
 ${GEM_LIBDIR}/test/template_test.rb
-${GEM_LIBDIR}/test/templates/_av_partial_1.haml
-${GEM_LIBDIR}/test/templates/_av_partial_1_ugly.haml
-${GEM_LIBDIR}/test/templates/_av_partial_2.haml
-${GEM_LIBDIR}/test/templates/_av_partial_2_ugly.haml
-${GEM_LIBDIR}/test/templates/_layout.erb
-${GEM_LIBDIR}/test/templates/_layout_for_partial.haml
-${GEM_LIBDIR}/test/templates/_partial.haml
-${GEM_LIBDIR}/test/templates/_text_area.haml
-${GEM_LIBDIR}/test/templates/_text_area_helper.html.haml
-${GEM_LIBDIR}/test/templates/action_view.haml
-${GEM_LIBDIR}/test/templates/action_view_ugly.haml
-${GEM_LIBDIR}/test/templates/breakage.haml
-${GEM_LIBDIR}/test/templates/content_for_layout.haml
-${GEM_LIBDIR}/test/templates/eval_suppressed.haml
-${GEM_LIBDIR}/test/templates/helpers.haml
-${GEM_LIBDIR}/test/templates/helpful.haml
-${GEM_LIBDIR}/test/templates/just_stuff.haml
-${GEM_LIBDIR}/test/templates/list.haml
-${GEM_LIBDIR}/test/templates/nuke_inner_whitespace.haml
-${GEM_LIBDIR}/test/templates/nuke_outer_whitespace.haml
-${GEM_LIBDIR}/test/templates/original_engine.haml
-${GEM_LIBDIR}/test/templates/partial_layout.haml
-${GEM_LIBDIR}/test/templates/partial_layout_erb.erb
-${GEM_LIBDIR}/test/templates/partialize.haml
-${GEM_LIBDIR}/test/templates/partials.haml
-${GEM_LIBDIR}/test/templates/render_layout.haml
-${GEM_LIBDIR}/test/templates/silent_script.haml
-${GEM_LIBDIR}/test/templates/standard.haml
-${GEM_LIBDIR}/test/templates/standard_ugly.haml
-${GEM_LIBDIR}/test/templates/tag_parsing.haml
-${GEM_LIBDIR}/test/templates/very_basic.haml
-${GEM_LIBDIR}/test/templates/whitespace_handling.haml
-${GEM_LIBDIR}/test/test_helper.rb
+${GEM_LIBDIR}/test/temple_line_counter_test.rb
 ${GEM_LIBDIR}/test/util_test.rb
+${GEM_LIBDIR}/yard/default/.gitignore
+${GEM_LIBDIR}/yard/default/fulldoc/html/css/common.sass
+${GEM_LIBDIR}/yard/default/layout/html/footer.erb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/textproc/ruby-haml/distinfo b/textproc/ruby-haml/distinfo
index 8d9e8d8efc7f0..635c9bb756ea5 100644
--- a/textproc/ruby-haml/distinfo
+++ b/textproc/ruby-haml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2015/11/04 02:00:08 agc Exp $
+$NetBSD: distinfo,v 1.18 2017/06/21 14:29:25 taca Exp $
 
-SHA1 (haml-4.0.7.gem) = 8cd4dd26aabcbb769ddc53993ad87b212962c007
-RMD160 (haml-4.0.7.gem) = 04590498901b2942dc86661314a23d433d61d690
-SHA512 (haml-4.0.7.gem) = 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568
-Size (haml-4.0.7.gem) = 121856 bytes
+SHA1 (haml-5.0.1.gem) = 53307f129d24da6514aa30c7a0229b4593b24061
+RMD160 (haml-5.0.1.gem) = e804876e7bccc3565d8a569b9e8d6d629cc69c49
+SHA512 (haml-5.0.1.gem) = 9300a810ae7dc30556c177b2eb75f67f0304cbe521ddfa212c6b0f90a193e49c3b78aaefef998fd2a8f9092c945fa54d2613910bc77f4c893febf5e874c81103
+Size (haml-5.0.1.gem) = 113152 bytes