diff --git a/layouts/_article.html b/layouts/_article.html
index 6595527..88b232c 100644
--- a/layouts/_article.html
+++ b/layouts/_article.html
@@ -6,7 +6,7 @@
     <span class="year"><%= post_date.year %></span>
   </abbr>
   <p>
-    <strong><a href="<%= @article.reps.first.path %>"><%= @article[:title] %></a></strong>
-    <%= @article[:extra] %>
+    <strong><a href="<%= @article.reps.first.path %>"><%=h @article[:title] %></a></strong>
+    <%=h @article[:extra] %>
   </p>
 </li>
diff --git a/layouts/_head.html b/layouts/_head.html
index 6be075b..1faf59d 100644
--- a/layouts/_head.html
+++ b/layouts/_head.html
@@ -1,6 +1,6 @@
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width" />
-<title><%= [@item[:title], 'WezM.net'].compact.join(' • ') %></title>
+<title><%=h [@item[:title], 'WezM.net'].compact.join(' - ') %></title>
 <!--[if lt IE 9]>
 <script src="/js/html5.js"></script>
 <![endif]-->
diff --git a/layouts/articles.html b/layouts/articles.html
index aa8769f..e7458b8 100644
--- a/layouts/articles.html
+++ b/layouts/articles.html
@@ -6,7 +6,7 @@
 <body class="articles">
   <%= render '_header' %>
   <div id="content">
-    <h1>Archives</h1>
+    <h1><%= h(@item[:title] || 'Articles') %></h1>
 
     <%
       menu = [
diff --git a/layouts/default.html b/layouts/default.html
index e672223..94ff625 100644
--- a/layouts/default.html
+++ b/layouts/default.html
@@ -6,7 +6,7 @@
 <body<%= %Q( class="#{@item[:body_class]}") if @item[:body_class] %>>
   <%= render '_header' %>
   <div id="content">
-    <h1><a href="<%= @item.reps.first.path %>"><%= @item[:title] %></a></h1>
+    <h1><a href="<%= @item.reps.first.path %>"><%=h @item[:title] %></a></h1>
     <%= yield %>
   </div>
   <%= render '_footer' %>
diff --git a/lib/default.rb b/lib/default.rb
index 07d9409..ab4f4f4 100644
--- a/lib/default.rb
+++ b/lib/default.rb
@@ -6,4 +6,5 @@ require 'json'
 include Nanoc3::Helpers::Rendering
 include Nanoc3::Helpers::Blogging
 include Nanoc3::Helpers::XMLSitemap
+include Nanoc3::Helpers::HTMLEscape
 include WezM::Helpers::Articles
