diff --git a/lib/gollum/views/overview.rb b/lib/gollum/views/overview.rb
index 2f532f6e..9eb3a715 100644
--- a/lib/gollum/views/overview.rb
+++ b/lib/gollum/views/overview.rb
@@ -20,18 +20,18 @@ module Precious
       def breadcrumb
         if @path
           path       = Pathname.new(@path)
-          breadcrumb = [%{<a href="#{overview_path}">Home</a>}]
+          breadcrumb = [%{<nav aria-label="Breadcrumb"><ol><li class="breadcrumb-item"><a href="#{overview_path}">Home</a></li>}]
           path.descend do |crumb|
             title = crumb.basename
 
             if title == path.basename
-              breadcrumb << title
+              breadcrumb << %{<li class="breadcrumb-item" aria-current="page">#{title}</li>}
             else
-              breadcrumb << %{<a href="#{overview_path}/#{crumb}/">#{title}</a>}
+              breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{title}</a></li>}
             end
           end
-
-          breadcrumb.join(' / ')
+          breadcrumb << %{</ol></nav>}
+          breadcrumb.join("\n")
         else
           'Home'
         end
diff --git a/lib/gollum/views/page.rb b/lib/gollum/views/page.rb
index 0d719d9c..9ffcddea 100644
--- a/lib/gollum/views/page.rb
+++ b/lib/gollum/views/page.rb
@@ -28,13 +28,14 @@ module Precious
       def breadcrumb
         path = Pathname.new(@page.url_path).parent
         return '' if path.to_s == '.'
-        breadcrumb = []
+        breadcrumb = [%{<nav aria-label="Breadcrumb"><ol>}]
         path.descend do |crumb|
           element = "#{crumb.basename}"
           next if element == @page.title
-          breadcrumb << %{<a href="#{overview_path}/#{crumb}/">#{element}</a>}
+          breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{element}</a></li>}
         end
-        breadcrumb.join(' / ') << ' /'
+        breadcrumb << %{</ol></nav>}
+        breadcrumb.join("\n")
       end
 
       def content