diff --git a/documentation/config/_default/config.toml b/documentation/config/_default/config.toml
index 8667900012..087c0f5576 100644
--- a/documentation/config/_default/config.toml
+++ b/documentation/config/_default/config.toml
@@ -1,45 +1,46 @@
 # FreeBSD documentation
 
 baseURL = "https://docs.freebsd.org/"
 title = "FreeBSD Documentation Portal"
 copyright = "BSD 2-clause 'Simplified' License"
 defaultContentLanguage = "en"
 defaultContentLanguageInSubdir = true
 disablePathToLower = true
 theme = "beastie"
 disableKinds = [ "taxonomy", "taxonomyTerm" ]
 authors = [ "carlavilla@FreeBSD.org" ]
 ignoreFiles = [ "chapter.adoc$", "contrib-386bsd.adoc$", "contrib-additional.adoc$", "contrib-committers.adoc$", "contrib-corealumni.adoc$", "contrib-develalumni.adoc$", "contrib-develinmemoriam.adoc$", "contrib-portmgralumni.adoc$", "\\.po$" ]
 enableRobotsTXT = true
+enableGitInfo = true
 
 [params]
   websiteURL = "https://www.FreeBSD.org"
   description = "FreeBSD Documentation Portal"
   isOnline = true
   editBaseUrl = "https://github.com/freebsd/freebsd-doc/edit/main/documentation/content/"
   downloadBaseUrl = "https://download.freebsd.org/doc/"
 
 [security]
   enableInlineShortcodes = false
   [security.exec]
     allow = ["^dart-sass-embedded$", "^go$", "^npx$", "^postcss$", "^asciidoctor$"]
     osEnv = ["(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM|LOAD_PATH|RUBYLIB)$"]
   [security.funcs]
     getenv = ["^HUGO_"]
   [security.http]
     methods = ["(?i)GET|POST"]
     urls = [".*"]
 
 [markup.asciidocExt]
     extensions = ["man-macro", "inter-document-references-macro", "cross-document-references-macro", "sectnumoffset-treeprocessor", "packages-macro", "git-macro"]
     [markup.asciidocExt.attributes]
       env-beastie = true
       isOnline = true
       skip-front-matter = true
 
 [outputs]
 home = [ "HTML" ]
 page = [ "HTML" ]
 list = [ "HTML" ]
 single = [ "HTML" ]
 section = [ "HTML" ]
diff --git a/documentation/themes/beastie/i18n/en.toml b/documentation/themes/beastie/i18n/en.toml
index 64c466ad01..5cb974ed89 100644
--- a/documentation/themes/beastie/i18n/en.toml
+++ b/documentation/themes/beastie/i18n/en.toml
@@ -1,296 +1,302 @@
 # ---------------------------------------------------
 # Global
 # ---------------------------------------------------
 [freebsd]
 other = "FreeBSD"
 
 [freebsd-project]
 other = "The FreeBSD Project"
 
 [freebsd-foundation]
 other = "The FreeBSD Foundation"
 
 [freebsd-documentation]
 other = "FreeBSD Documentation"
 
 [freebsd-documentation-main-desc]
 other = "FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms."
 
 [global-search-placeholder]
 other = "Search in the articles, books and guides."
 
 [toc]
 other = "Table of Contents"
 
 [resources]
 other = "Resources"
 
 [download-pdf]
 other = "Download PDF"
 
 [edit-page]
 other = "Edit this page"
 
 [trademarks]
 other = "trademarks"
 
 [books]
 other = "Books"
 
 [articles]
 other = "Articles"
 
 [choose-language]
 other = "Choose language"
 
+[last-modified]
+other = "Last modified on"
+
+[by]
+other = "by"
+
 # ---------------------------------------------------
 # Header
 # ---------------------------------------------------
 [documentation]
 other = "Documentation"
 
 [community]
 other = "Community"
 
 # ---------------------------------------------------
 # Main page
 # ---------------------------------------------------
 [getting-started]
 other = "Getting started"
 
 [learn-basics]
 other = "Learn about FreeBSD basics"
 
 [download]
 other = "Download"
 
 [download-freebsd]
 other = "Download FreeBSD"
 
 [handbook]
 other = "FreeBSD Handbook"
 
 [handbook-desc]
 other = "A constantly evolving, comprehensive resource for FreeBSD users"
 
 [porters-handbook]
 other = "FreeBSD Porter's Handbook"
 
 [porters-handbook-desc]
 other = "A complete reference about the FreeBSD ports system"
 
 [faq]
 other = "FreeBSD FAQ"
 
 [faq-desc]
 other = "FreeBSD frequently Asked Questions (FAQ) for 13.X and 12.X"
 
 [fdp]
 other = "Documentation Project Primer"
 
 [fdp-desc]
 other = "A complete guide about how to start contributing to the documentation"
 
 [books-list]
 other = "List of FreeBSD books"
 
 [articles-list]
 other = "List of FreeBSD articles"
 
 [manual-pages]
 other = "Manual pages"
 
 [manual-pages-desc]
 other = "FreeBSD Manual Pages"
 
 # ---------------------------------------------------
 # Footer
 # ---------------------------------------------------
 [light]
 other = "Light"
 
 [dark]
 other = "Dark"
 
 [high-contrast]
 other = "High contrast"
 
 [previous-versions]
 other = "Previous versions"
 
 [4-4bsd-documents]
 other = "4.4BSD Documents"
 
 [about]
 other = "About"
 
 [legal]
 other = "Legal"
 
 [donations]
 other = "Donations"
 
 [legal-notices]
 other = "Legal notices"
 
 [made-with]
 other = "Made with"
 
 [by-freebsd-community]
 other = "by the FreeBSD Community"
 
 [copyright]
 other = "All rights reserved."
 
 # ---------------------------------------------------
 # Articles page
 # ---------------------------------------------------
 [list-desc-articles]
 other = "Explore a comprehensive list of FreeBSD articles."
 
 # ---------------------------------------------------
 # Books page
 # ---------------------------------------------------
 [prev]
 other = "Prev"
 
 [next]
 other = "Next"
 
 [home]
 other = "Home"
 
 [split-html]
 other = "Split HTML"
 
 [single-html]
 other = "Single HTML"
 
 [book-chapters]
 other = "Book chapters"
 
 [book-menu]
 other = "Book menu"
 
 [list-desc-books]
 other = "Explore a comprehensive list of FreeBSD books."
 
 # ---------------------------------------------------
 # Languages page
 # ---------------------------------------------------
 [select-language]
 other = "Select a language"
 
 [current-selection]
 other = "Current selection:"
 
 # ---------------------------------------------------
 # Copyright
 # ---------------------------------------------------
 [freebsd-copyright]
 other = "FreeBSD is a registered trademark of the FreeBSD Foundation."
 
 [pam]
 other = "This article was written for the FreeBSD Project by ThinkSec AS and Network Associates Laboratories, the Security Research Division of Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 (“CBOSS”), as part of the DARPA CHATS research program."
 
 [coverity]
 other = "Coverity is a registered trademark; Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of Coverity, Inc."
 
 [ibm]
 other = "IBM, AIX, OS/2, PowerPC, PS/2, S/390, and ThinkPad are trademarks of International Business Machines Corporation in the United States, other countries, or both."
 
 [ieee]
 other = "IEEE, POSIX, and 802 are registered trademarks of Institute of Electrical and Electronics Engineers, Inc. in the United States."
 
 [redhat]
 other = "Red Hat, RPM, are trademarks or registered trademarks of Red Hat, Inc. in the United States and other countries."
 
 [3com]
 other = "3Com and HomeConnect are registered trademarks of 3Com Corporation."
 
 [amd]
 other = "AMD, AMD Athlon, AMD Opteron, AMD Phenom, AMD Sempron, AMD Turion, Athlon, Élan, Opteron, and PCnet are trademarks of Advanced Micro Devices, Inc."
 
 [adobe]
 other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries."
 
 [apple]
 other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries."
 
 [intel]
 other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries."
 
 [linux]
 other = "Linux is a registered trademark of Linus Torvalds."
 
 [microsoft]
 other = "Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media and Windows NT are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries."
 
 [opengroup]
 other = "Motif, OSF/1, and UNIX are registered trademarks and IT DialTone and The Open Group are trademarks of The Open Group in the United States and other countries."
 
 [qualcomm]
 other = "QUALCOMM and Eudora are registered trademarks of QUALCOMM Incorporated."
 
 [sparc]
 other = "SPARC, SPARC64, and UltraSPARC are trademarks of SPARC International, Inc in the United States and other countries. SPARC International, Inc owns all of the SPARC trademarks and under licensing agreements allows the proper use of these trademarks by its members."
 
 [sun]
 other = "Sun, Sun Microsystems, Java, Java Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK, Solaris, StarOffice, SunOS and VirtualBox are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries."
 
 [unix]
 other = "UNIX is a registered trademark of The Open Group in the United States and other countries."
 
 [netbsd]
 other = "NetBSD is a registered trademark of the NetBSD Foundation."
 
 [realnetworks]
 other = "RealNetworks, RealPlayer, and RealAudio are the registered trademarks of RealNetworks, Inc."
 
 [oracle]
 other = "Oracle is a registered trademark of Oracle Corporation."
 
 [3ware]
 other = "3ware is a registered trademark of 3ware Inc."
 
 [arm]
 other = "ARM is a registered trademark of ARM Limited."
 
 [adaptec]
 other = "Adaptec is a registered trademark of Adaptec, Inc."
 
 [google]
 other = "Android is a trademark of Google Inc."
 
 [heidelberger]
 other = "Heidelberg, Helvetica, Palatino, and Times Roman are either registered trademarks or trademarks of Heidelberger Druckmaschinen AG in the U.S. and other countries."
 
 [intuit]
 other = "Intuit and Quicken are registered trademarks and/or registered service marks of Intuit Inc., or one of its subsidiaries, in the United States and other countries."
 
 [lsilogic]
 other = "LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID and Mylex are trademarks or registered trademarks of LSI Logic Corp."
 
 [themathworks]
 other = "MATLAB is a registered trademark of The MathWorks, Inc."
 
 [thomson]
 other = "SpeedTouch is a trademark of Thomson."
 
 [vmware]
 other = "VMware is a trademark of VMware, Inc."
 
 [wolframresearch]
 other = "Mathematica is a registered trademark of Wolfram Research, Inc."
 
 [xiph]
 other = "Ogg Vorbis and Xiph.Org are trademarks of Xiph.Org."
 
 [xfree86]
 other = "XFree86 is a trademark of The XFree86 Project, Inc."
 
 [daemon-news]
 other = "This article was originally published in the January 2000 issue of <a class=\"link\" href=\"http://www.daemonnews.org/\">DaemonNews</a>. This version of the article may include updates from Matt and other authors to reflect changes in FreeBSD's VM implementation."
 
 [general]
 other = "Many of the designations used by manufacturers and sellers to distinguish their products are claimed as trademarks. Where those designations appear in this document, and the FreeBSD Project was aware of the trademark claim, the designations have been followed by the “™” or the “®” symbol."
diff --git a/documentation/themes/beastie/layouts/articles/list.html b/documentation/themes/beastie/layouts/articles/list.html
index 8719a9cc87..e03ae61918 100644
--- a/documentation/themes/beastie/layouts/articles/list.html
+++ b/documentation/themes/beastie/layouts/articles/list.html
@@ -1,57 +1,47 @@
 {{ define "main" }}
 <main class="main-wrapper-article">
   <div class="article">
     <h1 class="title">{{ .Title }}</h1>
     {{ if .Params.subtitle }}
       <h3 class="subtitle">{{ .Params.subtitle }}</h3>
     {{ end }}
-    <div>
-      {{ $releaseInfo := split .Params.releaseinfo " " }}
-
-      {{if gt (len $releaseInfo) 3}}
-        {{ i18n "revision" }}:
-        <a href="https://cgit.freebsd.org/doc/commit/?id=">
-          <span class="gitref">{{ index $releaseInfo 2 }}</span>
-        </a>
-      {{ end }}
-    </div>
     {{ if .Params.copyright }}
       <div class="copyright">
         Copyright © {{ .Params.copyright }}
       </div>
     {{ end}}
     {{ if isset .Params "trademarks" }}
       {{ partial "trademarks" .Params.trademarks }}
     {{ end }}
-    <div>
-      {{if gt (len $releaseInfo) 5}}
-        {{ $hour := replace (index $releaseInfo 4) "Z" "" }}
-        {{ i18n "last-modified" }} {{ index $releaseInfo 3 }} {{ $hour }} {{ i18n "by" }} {{ index $releaseInfo 5 }}.
-      {{ end }}
-    </div>
     <div class="toc-mobile">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
     </div>
     {{ .Content }}
+    {{ if .GitInfo }}
+    <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
   </div>
   <aside class="toc">
     <div class="toc-content">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
       <hr />
       <div class="resources">
         <h3>{{ i18n "resources" }}</h3>
         <ul class="contents">
           {{ $pathSections := split .Page.File "/" }}
           {{ $path := printf "%s/%s/%s_%s.pdf" (index $pathSections 0) (index $pathSections 1) (index $pathSections 1) $.Site.Home.Language }}
           {{ $pdfUrl := printf "%s%s/%s" $.Site.Params.downloadBaseUrl $.Site.Home.Language $path }}
           <li><i class="fa fa-file-pdf-o" aria-hidden="true"></i><a href="{{ $pdfUrl }}">{{ i18n "download-pdf" }}</a></li>
           {{ $editUrl := printf "%s%s/%s" $.Site.Params.editBaseUrl $.Site.Home.Language .Page.File }}
           <li><i class="fa fa-pencil-square-o" aria-hidden="true"></i><a href="{{ $editUrl }}" target="_blank">{{ i18n "edit-page" }}</a></li>
         </ul>
       </div>
     </div>
   </aside>
 </main>
 {{ end }}
diff --git a/documentation/themes/beastie/layouts/articles/single.html b/documentation/themes/beastie/layouts/articles/single.html
index 8719a9cc87..e03ae61918 100644
--- a/documentation/themes/beastie/layouts/articles/single.html
+++ b/documentation/themes/beastie/layouts/articles/single.html
@@ -1,57 +1,47 @@
 {{ define "main" }}
 <main class="main-wrapper-article">
   <div class="article">
     <h1 class="title">{{ .Title }}</h1>
     {{ if .Params.subtitle }}
       <h3 class="subtitle">{{ .Params.subtitle }}</h3>
     {{ end }}
-    <div>
-      {{ $releaseInfo := split .Params.releaseinfo " " }}
-
-      {{if gt (len $releaseInfo) 3}}
-        {{ i18n "revision" }}:
-        <a href="https://cgit.freebsd.org/doc/commit/?id=">
-          <span class="gitref">{{ index $releaseInfo 2 }}</span>
-        </a>
-      {{ end }}
-    </div>
     {{ if .Params.copyright }}
       <div class="copyright">
         Copyright © {{ .Params.copyright }}
       </div>
     {{ end}}
     {{ if isset .Params "trademarks" }}
       {{ partial "trademarks" .Params.trademarks }}
     {{ end }}
-    <div>
-      {{if gt (len $releaseInfo) 5}}
-        {{ $hour := replace (index $releaseInfo 4) "Z" "" }}
-        {{ i18n "last-modified" }} {{ index $releaseInfo 3 }} {{ $hour }} {{ i18n "by" }} {{ index $releaseInfo 5 }}.
-      {{ end }}
-    </div>
     <div class="toc-mobile">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
     </div>
     {{ .Content }}
+    {{ if .GitInfo }}
+    <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
   </div>
   <aside class="toc">
     <div class="toc-content">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
       <hr />
       <div class="resources">
         <h3>{{ i18n "resources" }}</h3>
         <ul class="contents">
           {{ $pathSections := split .Page.File "/" }}
           {{ $path := printf "%s/%s/%s_%s.pdf" (index $pathSections 0) (index $pathSections 1) (index $pathSections 1) $.Site.Home.Language }}
           {{ $pdfUrl := printf "%s%s/%s" $.Site.Params.downloadBaseUrl $.Site.Home.Language $path }}
           <li><i class="fa fa-file-pdf-o" aria-hidden="true"></i><a href="{{ $pdfUrl }}">{{ i18n "download-pdf" }}</a></li>
           {{ $editUrl := printf "%s%s/%s" $.Site.Params.editBaseUrl $.Site.Home.Language .Page.File }}
           <li><i class="fa fa-pencil-square-o" aria-hidden="true"></i><a href="{{ $editUrl }}" target="_blank">{{ i18n "edit-page" }}</a></li>
         </ul>
       </div>
     </div>
   </aside>
 </main>
 {{ end }}
diff --git a/documentation/themes/beastie/layouts/books/list.html b/documentation/themes/beastie/layouts/books/list.html
index 95f282804d..7a50dcf830 100644
--- a/documentation/themes/beastie/layouts/books/list.html
+++ b/documentation/themes/beastie/layouts/books/list.html
@@ -1,139 +1,144 @@
 {{ define "main" }}
 <input type="checkbox" class="hidden toggle" id="menu-control">
 <main class="main-wrapper-book">
   <a id="top"></a>
   {{ if eq .Params.showBookMenu true }}
   <aside class="book-menu">
     <div class="book-menu-content">
       <h3>{{ i18n "book-chapters" }}</h3>
       <nav id="MenuContents">
         {{ partial "menu" . }}
       </nav>
     </div>
   </aside>
   {{ end }}
   <div class="book">
     {{ if eq .Params.showBookMenu true }}
     <div class="book-menu-mobile">
       <label for="menu-control">
         <span class="menu-control-button">
           <i class="fa fa-list" aria-hidden="true"></i>
           {{ i18n "book-menu" }}
         </span>
       </label>
     </div>
     {{ end }}
     <h1 class="title">{{ .Title }}</h1>
     {{ if .Params.subtitle }}
       <h3 class="subtitle">{{ .Params.subtitle }}</h3>
     {{ end }}
     <div>
     </div>
     {{ if .Params.copyright }}
       <div class="copyright">
         Copyright © {{ .Params.copyright }}
       </div>
     {{ end}}
     {{ if isset .Params "trademarks" }}
       {{ partial "trademarks" .Params.trademarks }}
     {{ end }}
     <div>
     </div>
     <div class="toc-mobile">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
     </div>
     {{ if $.Site.Params.isOnline }}
       {{ if .Params.add_split_page_link }}
       <div>
         [ <a href="../">{{ i18n "split-html" }}</a> / {{ i18n "single-html" }} ]
       </div>
       {{ end }}
       {{ if .Params.add_single_page_link }}
       <div>
         [ {{ i18n "split-html" }} / <a href="book/">{{ i18n "single-html" }}</a> ]
       </div>
-    {{ end }}
+      {{ end }}
     {{ end }}
     <div class="book-content">
       {{ .Content }}
     </div>
+    {{ if .GitInfo }}
     <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
     <div class="buttons">
       {{ if .Params.prev }}
       <div class="prev">
         <i class="fa fa-angle-left" aria-hidden="true"></i>
         <div class="container">
           {{ if $.Site.Params.isOnline }}
             <a href={{ .Params.Prev | absLangURL }} class="direction">{{ i18n "prev" }}</a>
           {{ else }}
             {{ $pathSectionsPrev := split .Params.Prev "/" }}
 
             {{if eq (len $pathSectionsPrev) 3}}
               {{ $path := index $pathSectionsPrev 2 }}
               <a href=../{{ $path }}/index.html>{{ i18n "prev" }}</a>
             {{ end }}
             {{if eq (len $pathSectionsPrev) 2}}
               <a href=../index.html>{{ i18n "prev" }}</a>
             {{ end }}
           {{ end }}
         </div>
       </div>
       {{ end }}
       <div class="home">
         <i class="fa fa-home" aria-hidden="true"></i>
         <div class="container">
           {{ if $.Site.Params.isOnline }}
             <a href="../" class="direction">{{ i18n "home" }}</a>
           {{ else }}
             <a href="../index.html" class="direction">{{ i18n "home" }}</a>
           {{ end }}
         </div>
       </div>
       {{ if .Params.next }}
       <div class="next">
         <div class="container">
           {{ if $.Site.Params.isOnline }}
             <a href={{ .Params.Next | absLangURL }}  class="direction">{{ i18n "next" }}</a>
           {{ else }}
             {{ $pathSectionsNext := split .Params.next "/" }}
 
             {{if eq (len $pathSectionsNext) 3}}
               {{ $book := index $pathSectionsNext 1 }}
               {{ $chapter := index $pathSectionsNext 2 }}
               <a href=../{{ $book }}/{{ $chapter }}/index.html>{{ i18n "next" }}</a>
             {{ end }}
             {{if eq (len $pathSectionsNext) 2}}
               <a href=../index.html>{{ i18n "next" }}</a>
             {{ end }}
           {{ end }}
         </div>
         <i class="fa fa-angle-right" aria-hidden="true"></i>
       </div>
       {{ end }}
     </div>
     <label class="hidden book-menu-overlay" for="menu-control"></label>
   </div>
   <aside class="toc">
     <div class="toc-content">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
       <hr />
       <div class="resources">
         <h3>{{ i18n "resources" }}</h3>
         <ul class="contents">
           {{ $pathSections := split .Page.File "/" }}
           {{ $path := printf "%s/%s/%s_%s.pdf" (index $pathSections 0) (index $pathSections 1) (index $pathSections 1) $.Site.Home.Language }}
           {{ $pdfUrl := printf "%s%s/%s" $.Site.Params.downloadBaseUrl $.Site.Home.Language $path }}
           <li><i class="fa fa-file-pdf-o" aria-hidden="true"></i><a href="{{ $pdfUrl }}">{{ i18n "download-pdf" }}</a></li>
           {{ $editUrl := printf "%s%s/%s" $.Site.Params.editBaseUrl $.Site.Home.Language .Page.File }}
           <li><i class="fa fa-pencil-square-o" aria-hidden="true"></i><a href="{{ $editUrl }}" target="_blank">{{ i18n "edit-page" }}</a></li>
         </ul>
       </div>
     </div>
   </aside>
   <a class="to-top" href="#top">
     <i class="fa fa-arrow-circle-up" aria-hidden="true"></i>
   </a>
 </main>
 {{ end }}
diff --git a/documentation/themes/beastie/layouts/books/single.html b/documentation/themes/beastie/layouts/books/single.html
index 95f282804d..7a50dcf830 100644
--- a/documentation/themes/beastie/layouts/books/single.html
+++ b/documentation/themes/beastie/layouts/books/single.html
@@ -1,139 +1,144 @@
 {{ define "main" }}
 <input type="checkbox" class="hidden toggle" id="menu-control">
 <main class="main-wrapper-book">
   <a id="top"></a>
   {{ if eq .Params.showBookMenu true }}
   <aside class="book-menu">
     <div class="book-menu-content">
       <h3>{{ i18n "book-chapters" }}</h3>
       <nav id="MenuContents">
         {{ partial "menu" . }}
       </nav>
     </div>
   </aside>
   {{ end }}
   <div class="book">
     {{ if eq .Params.showBookMenu true }}
     <div class="book-menu-mobile">
       <label for="menu-control">
         <span class="menu-control-button">
           <i class="fa fa-list" aria-hidden="true"></i>
           {{ i18n "book-menu" }}
         </span>
       </label>
     </div>
     {{ end }}
     <h1 class="title">{{ .Title }}</h1>
     {{ if .Params.subtitle }}
       <h3 class="subtitle">{{ .Params.subtitle }}</h3>
     {{ end }}
     <div>
     </div>
     {{ if .Params.copyright }}
       <div class="copyright">
         Copyright © {{ .Params.copyright }}
       </div>
     {{ end}}
     {{ if isset .Params "trademarks" }}
       {{ partial "trademarks" .Params.trademarks }}
     {{ end }}
     <div>
     </div>
     <div class="toc-mobile">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
     </div>
     {{ if $.Site.Params.isOnline }}
       {{ if .Params.add_split_page_link }}
       <div>
         [ <a href="../">{{ i18n "split-html" }}</a> / {{ i18n "single-html" }} ]
       </div>
       {{ end }}
       {{ if .Params.add_single_page_link }}
       <div>
         [ {{ i18n "split-html" }} / <a href="book/">{{ i18n "single-html" }}</a> ]
       </div>
-    {{ end }}
+      {{ end }}
     {{ end }}
     <div class="book-content">
       {{ .Content }}
     </div>
+    {{ if .GitInfo }}
     <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
     <div class="buttons">
       {{ if .Params.prev }}
       <div class="prev">
         <i class="fa fa-angle-left" aria-hidden="true"></i>
         <div class="container">
           {{ if $.Site.Params.isOnline }}
             <a href={{ .Params.Prev | absLangURL }} class="direction">{{ i18n "prev" }}</a>
           {{ else }}
             {{ $pathSectionsPrev := split .Params.Prev "/" }}
 
             {{if eq (len $pathSectionsPrev) 3}}
               {{ $path := index $pathSectionsPrev 2 }}
               <a href=../{{ $path }}/index.html>{{ i18n "prev" }}</a>
             {{ end }}
             {{if eq (len $pathSectionsPrev) 2}}
               <a href=../index.html>{{ i18n "prev" }}</a>
             {{ end }}
           {{ end }}
         </div>
       </div>
       {{ end }}
       <div class="home">
         <i class="fa fa-home" aria-hidden="true"></i>
         <div class="container">
           {{ if $.Site.Params.isOnline }}
             <a href="../" class="direction">{{ i18n "home" }}</a>
           {{ else }}
             <a href="../index.html" class="direction">{{ i18n "home" }}</a>
           {{ end }}
         </div>
       </div>
       {{ if .Params.next }}
       <div class="next">
         <div class="container">
           {{ if $.Site.Params.isOnline }}
             <a href={{ .Params.Next | absLangURL }}  class="direction">{{ i18n "next" }}</a>
           {{ else }}
             {{ $pathSectionsNext := split .Params.next "/" }}
 
             {{if eq (len $pathSectionsNext) 3}}
               {{ $book := index $pathSectionsNext 1 }}
               {{ $chapter := index $pathSectionsNext 2 }}
               <a href=../{{ $book }}/{{ $chapter }}/index.html>{{ i18n "next" }}</a>
             {{ end }}
             {{if eq (len $pathSectionsNext) 2}}
               <a href=../index.html>{{ i18n "next" }}</a>
             {{ end }}
           {{ end }}
         </div>
         <i class="fa fa-angle-right" aria-hidden="true"></i>
       </div>
       {{ end }}
     </div>
     <label class="hidden book-menu-overlay" for="menu-control"></label>
   </div>
   <aside class="toc">
     <div class="toc-content">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
       <hr />
       <div class="resources">
         <h3>{{ i18n "resources" }}</h3>
         <ul class="contents">
           {{ $pathSections := split .Page.File "/" }}
           {{ $path := printf "%s/%s/%s_%s.pdf" (index $pathSections 0) (index $pathSections 1) (index $pathSections 1) $.Site.Home.Language }}
           {{ $pdfUrl := printf "%s%s/%s" $.Site.Params.downloadBaseUrl $.Site.Home.Language $path }}
           <li><i class="fa fa-file-pdf-o" aria-hidden="true"></i><a href="{{ $pdfUrl }}">{{ i18n "download-pdf" }}</a></li>
           {{ $editUrl := printf "%s%s/%s" $.Site.Params.editBaseUrl $.Site.Home.Language .Page.File }}
           <li><i class="fa fa-pencil-square-o" aria-hidden="true"></i><a href="{{ $editUrl }}" target="_blank">{{ i18n "edit-page" }}</a></li>
         </ul>
       </div>
     </div>
   </aside>
   <a class="to-top" href="#top">
     <i class="fa fa-arrow-circle-up" aria-hidden="true"></i>
   </a>
 </main>
 {{ end }}
diff --git a/website/config/_default/config.toml b/website/config/_default/config.toml
index 9bd9ecbd9d..3a9b767b11 100644
--- a/website/config/_default/config.toml
+++ b/website/config/_default/config.toml
@@ -1,54 +1,54 @@
 # FreeBSD website
 
 baseURL = "https://www.freebsd.org/"
 title = "The FreeBSD Project"
 copyright = "BSD 2-clause 'Simplified' License"
 DefaultContentLanguage = "en"
 defaultContentLanguageInSubdir = false
 theme = "beastie"
 disableKinds = [ "taxonomy", "taxonomyTerm" ]
 disableLanguages = ["tr", "el"]
 disablePathToLower = true
 authors = [ "carlavilla@FreeBSD.org" ]
 ignoreFiles = [ "\\.po$" ]
 enableRobotsTXT = true
-
+enableGitInfo = true
 preserveTOC = true
 
 [markup.asciidocExt]
     preserveTOC = true
     extensions = ["man-macro", "inter-document-references-macro", "sectnumoffset-treeprocessor", "packages-macro", "git-macro"]
 
 [security]
   enableInlineShortcodes = false
   [security.exec]
     allow = ["^dart-sass-embedded$", "^go$", "^npx$", "^postcss$", "^asciidoctor$"]
     osEnv = ["(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM|LOAD_PATH|RUBYLIB)$"]
   [security.funcs]
     getenv = ["^HUGO_"]
   [security.http]
     methods = ["(?i)GET|POST"]
     urls = [".*"]
 
 staticDir = ["static", "shared"]
 
 [outputs]
 home = [ "HTML" ]
 page = [ "HTML" ]
 list = [ "HTML" ]
 single = [ "HTML" ]
 section = [ "HTML", "RSS", "Calendar" ]
 
 [outputFormats]
 [outputFormats.Calendar]
 BaseName = "calendar"
 IsHTML = true
 IsPlainText = false
 
 [outputFormats.RSS]
 MediaType = "application/rss+xml"
 BaseName = "feed"
 IsHTML = true
 IsPlainText = false
 noUgly = true
 Rel = "alternate"
diff --git a/website/themes/beastie/i18n/en.toml b/website/themes/beastie/i18n/en.toml
index 50ef8159b9..8767ae2140 100644
--- a/website/themes/beastie/i18n/en.toml
+++ b/website/themes/beastie/i18n/en.toml
@@ -1,603 +1,609 @@
 # Global
 [freebsd]
 other = "FreeBSD"
 
 [freebsdProject]
 other = "The FreeBSD Project"
 
 [freebsdPowerServe]
 other = "FreeBSD The Power to Serve"
 
 [freebsdFoundation]
 other = "The FreeBSD Foundation"
 
 [downloadFreeBSD]
 other = "Download FreeBSD"
 
 [production]
 other = "Production"
 
+[last-modified]
+other = "Last modified on"
+
+[by]
+other = "by"
+
 # Header
 [donate]
 other = "Donate to FreeBSD"
 
 [donateFoundation]
 other = "Donate to the FreeBSD Foundation"
 
 [search]
 other = "Search"
 
 # Navigation
 [home]
 other = "Home"
 
 [about]
 other = "About"
 
 [introduction]
 other = "Introduction"
 
 [features]
 other = "Features"
 
 [advocacy]
 other = "Advocacy"
 
 [marketing]
 other = "Marketing"
 
 [privacyPolicy]
 other = "Privacy Policy"
 
 [getFreeBSD]
 other = "Get FreeBSD"
 
 [releaseInformation]
 other = "Release Information"
 
 [releaseEngineering]
 other = "Release Engineering"
 
 [documentation]
 other = "Documentation"
 
 [faq]
 other = "FAQ"
 
 [handbook]
 other = "Handbook"
 
 [porterHandbook]
 other = "Porter's Handbook"
 
 [developerHandbook]
 other = "Developer's Handbook"
 
 [committersGuide]
 other = "Committer's Guide"
 
 [manualPages]
 other = "Manual Pages"
 
 [documentationProjectPrimer]
 other = "Documentation Project Primer"
 
 [allBooksArticles]
 other = "All Books and Articles"
 
 [community]
 other = "Community"
 
 [mailingLists]
 other = "Mailing Lists"
 
 [forums]
 other = "Forums"
 
 [userGroups]
 other = "User Groups"
 
 [events]
 other = "Events"
 
 [FreeBSDJournal]
 other = "FreeBSD Journal"
 
 [QA]
 other = "Q&A (external)"
 
 [developers]
 other = "Developers"
 
 [projectIdeas]
 other = "Project Ideas"
 
 [subversionRepository]
 other = "Subversion Repository"
 
 [gitRepository]
 other = "Git Repository"
 
 [gitMirror]
 other = "GitHub Mirror"
 
 [phabricator]
 other = "Code Review (Phabricator)"
 
 [wiki]
 other = "Wiki"
 
 [CI]
 other = "Continuous Integration Service"
 
 [support]
 other = "Support"
 
 [vendors]
 other = "Vendors"
 
 [securityInformation]
 other = "Security Information"
 
 [bugReports]
 other = "Bug Reports"
 
 [submittingBugReports]
 other = "Submitting Bug Reports"
 
 [foundation]
 other = "Foundation"
 
 [monetaryDonations]
 other = "Monetary Donations"
 
 [hardwareDonations]
 other = "Hardware Donations"
 
 #Main
 [freebsdDescription1]
 other = "FreeBSD is an operating system used to power modern servers, desktops, and embedded"
 
 [freebsdDescription2]
 other = "platforms."
 
 [freebsdDescription3]
 other = "A large"
 
 [freebsdDescription4]
 other = "community"
 
 [freebsdDescription5]
 other = "has continually developed it for more than thirty years. Its advanced networking, security, and storage features have made FreeBSD the platform of choice for many of the"
 
 [freebsdDescription6]
 other = "busiest web sites"
 
 [freebsdDescription7]
 other = "and most pervasive embedded networking and storage devices."
 
 [learnMore]
 other = "Learn More"
 
 [getThe]
 other = "Get the"
 
 [journal]
 other = "FreeBSD Journal"
 
 [25th-logo]
 other = "25th Anniversary Logo"
 
 [supportedReleases]
 other = "Supported Releases"
 
 [supportLifecycle]
 other = "Support Lifecycle"
 
 [upcoming]
 other = "Upcoming"
 
 [newFreeBSD]
 other= "New to FreeBSD?"
 
 [shortcuts]
 other = "SHORTCUTS"
 
 [reportingProblems]
 other = "Reporting Problems"
 
 [ports]
 other = "Ports"
 
 [latestNews]
 other = "LATEST NEWS"
 
 [upcomingEvents]
 other = "UPCOMING EVENTS"
 
 [press]
 other = "PRESS"
 
 [securityAdvisories]
 other = "SECURITY ADVISORIES"
 
 [errataNotices]
 other = "ERRATA NOTICES"
 
 [moreNews]
 other = "More News"
 
 [moreEvents]
 other = "More Events"
 
 [moreMedia]
 other = "More Media"
 
 [moreErrata]
 other = "More Errata Notices"
 
 [more]
 other = "More"
 
 [rssNews]
 other = "News RSS Feed"
 
 [rssSecurity]
 other = "Security Advisories and Errata Notices RSS Feed"
 
 #404
 [pageNotFound]
 other = "Page not found."
 
 [notFoundTitle]
 other = "We could not find the page you requested."
 
 [notFoundDesc]
 other = "Please try your request again, use one of the links in the navigation menu, or the search box at the top of the page."
 
 # Footer
 [copyright]
 other = "All rights reserved."
 
 [trademark]
 other = "The mark FreeBSD is a registered trademark of The FreeBSD Foundation and is used by The FreeBSD Project with the permission of"
 
 [contact]
 other = "Contact"
 
 [legalNotices]
 other = "Legal Notices"
 
 # Ports form
 [ports-search]
 other = "Search ports for:"
 
 [all]
 other = "All"
 
 [package-name]
 other = "Package Name"
 
 [description]
 other = "Description"
 
 [long-description]
 other = "Long description"
 
 [maintainer]
 other = "Maintainer"
 
 [requires]
 other = "Requires"
 
 [submit]
 other = "Submit"
 
 # Months
 [1]
 other = "January"
 
 [2]
 other = "February"
 
 [3]
 other = "March"
 
 [4]
 other = "April"
 
 [5]
 other = "May"
 
 [6]
 other = "June"
 
 [7]
 other = "July"
 
 [8]
 other = "August"
 
 [9]
 other = "September"
 
 [10]
 other = "October"
 
 [11]
 other = "November"
 
 [12]
 other = "December"
 
 # Security section
 [data]
 other = "Data"
 
 [errataNoticeName]
 other = "Errata Notice name"
 
 [advisoryName]
 other = "Advisory name"
 
 # Events section
 [currentEvents]
 other = "Current/Upcoming Events:"
 
 [pastEvents]
 other = "Past Events:"
 
 [upcomingFreeBSDEvents]
 other = "Upcoming FreeBSD Events"
 
 # Continents, countries
 [europe]
 other = "Europe"
 
 [africa]
 other = "Africa"
 
 [australia]
 other = "Australia"
 
 [newZealand]
 other = "New Zealand"
 
 [northAmerica]
 other = "North America"
 
 [asia]
 other = "Asia"
 
 [southAmerica]
 other = "South America"
 
 [oceania]
 other = "Oceania"
 
 [global]
 other = "Global"
 
 # Commercial software
 [databases]
 other = "Databases"
 
 [developmentTools]
 other = "Development Tools"
 
 [ecommerce]
 other = "E-Commerce Solutions and Tools"
 
 [email]
 other = "Electronic Mail Software"
 
 [misc]
 other = "Miscellaneous"
 
 [network]
 other = "Network Systems and Applications"
 
 [scientific]
 other = "Scientific and Language Tools"
 
 [security]
 other = "Security"
 
 [isp]
 other = "System Administration / ISP"
 
 # sidenav
 [applications]
 other = "Applications"
 
 [administration]
 other = "Administration"
 
 [news]
 other = "News"
 
 [pressSidenav]
 other = "Press"
 
 [multimedia]
 other = "Multimedia"
 
 [art]
 other = "Artwork"
 
 [logo]
 other = "Logo"
 
 [donations]
 other = "Donations"
 
 [privacy]
 other = "Privacy Policy"
 
 [mailinglists]
 other = "Mailing Lists"
 
 [newsgroups]
 other = "Newsgroups"
 
 [usergroups]
 other = "User Groups"
 
 [sourceCodeRepositories]
 other = "Source code repositories"
 
 [releng]
 other = "Release Engineering"
 
 [platforms]
 other = "Platforms"
 
 [ideas]
 other = "Project Ideas"
 
 [contributing]
 other = "Contributing"
 
 [FAQ]
 other = "FAQ"
 
 [man]
 other = "Manual Pages"
 
 [papers]
 other = "Presentations and Papers"
 
 [booksArticles]
 other = "Books and Articles Online"
 
 [publications]
 other = "Publications"
 
 [newbies]
 other = "For Newbies"
 
 [docproj]
 other = "Documentation Project"
 
 [archive]
 other = "Archive"
 
 [releases]
 other = "Release Information"
 
 [productionRelease]
 other = "Production Release"
 
 [upcomingRelease]
 other = "Upcoming Release"
 
 [snapshotReleases]
 other = "Snapshot Releases"
 
 [portedApplications]
 other = "Ported Applications"
 
 [gnome]
 other = "GNOME"
 
 [installationInstructions]
 other = "Installation Instructions"
 
 [upgradeInstructions]
 other = "Upgrade Instructions"
 
 [availableApplications]
 other = "Available Applications"
 
 [howHelp]
 other = "How to Help"
 
 [reportingBug]
 other = "Reporting a Bug"
 
 [screenshots]
 other = "Screenshots"
 
 [contactUs]
 other = "Contact Us"
 
 [HALFAQ]
 other = "HAL FAQ"
 
 [upgradeFAQ]
 other = "2.30 to 2.32 Upgrade FAQ"
 
 [developmentBranchFAQ]
 other = "Development Branch FAQ"
 
 [creatingPorts]
 other = "Creating Ports"
 
 [knownIssues]
 other = "Known Issues"
 
 [aboutPorts]
 other = "About ports"
 
 [installing]
 other = "Installing"
 
 [updating]
 other = "Updating"
 
 [searching]
 other = "Searching"
 
 [categories]
 other = "Categories"
 
 [alphabetically]
 other = "listed alphabetically"
 
 [logicalGroup]
 other = "listed by logical group"
 
 [allPorts]
 other = "List of All Ports"
 
 [moreInformation]
 other = "For More Information"
 
 [software]
 other = "Software"
 
 [hardware]
 other = "Hardware"
 
 [consulting]
 other = "Consulting"
 
 [ispCommercial]
 other = "Internet Service Providers"
 
 [securityInfo]
 other = "Security Information"
 
 [advisories]
 other = "Advisories"
 
 [errataNoticesSidenav]
 other = "Errata Notices"
 
 [unsupportedReleases]
 other = "Unsupported Releases"
 
 [readSecurityAdvisories]
 other = "How to read FreeBSD Security Advisories"
 
 [charterSecurityOfficerTeam]
 other = "Charter for the Security Officer and Team"
 
 [bugreports]
 other = "Bug Reports"
 
 [submitPR]
 other = "Submit a Problem Report"
 
 [webresources]
 other = "Web Resources"
diff --git a/website/themes/beastie/layouts/_default/list.html b/website/themes/beastie/layouts/_default/list.html
index 5e6bbd97a4..286e9ccd5e 100644
--- a/website/themes/beastie/layouts/_default/list.html
+++ b/website/themes/beastie/layouts/_default/list.html
@@ -1,13 +1,19 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
       {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
+    {{ if .GitInfo }}
+    <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
   </div>
 </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/_default/single.html b/website/themes/beastie/layouts/_default/single.html
index 5e6bbd97a4..286e9ccd5e 100644
--- a/website/themes/beastie/layouts/_default/single.html
+++ b/website/themes/beastie/layouts/_default/single.html
@@ -1,13 +1,19 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
       {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
+    {{ if .GitInfo }}
+    <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
   </div>
 </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/commercial/list.html b/website/themes/beastie/layouts/commercial/list.html
index 1449315e77..241b529958 100644
--- a/website/themes/beastie/layouts/commercial/list.html
+++ b/website/themes/beastie/layouts/commercial/list.html
@@ -1,32 +1,38 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
     </div>
     <div id="contentwrap">
       {{- .Content -}}
 
       {{ if eq .Params.vendor "software" }}
         {{ partial "commercial-software.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "isp" }}
         {{ partial "commercial-isp.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "hardware" }}
         {{ partial "commercial-hardware.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "consult" }}
         {{ partial "commercial-consulting.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "misc" }}
         {{ partial "commercial-misc.html" . }}
       {{ end }}
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/commercial/single.html b/website/themes/beastie/layouts/commercial/single.html
index 1449315e77..241b529958 100644
--- a/website/themes/beastie/layouts/commercial/single.html
+++ b/website/themes/beastie/layouts/commercial/single.html
@@ -1,32 +1,38 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
     </div>
     <div id="contentwrap">
       {{- .Content -}}
 
       {{ if eq .Params.vendor "software" }}
         {{ partial "commercial-software.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "isp" }}
         {{ partial "commercial-isp.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "hardware" }}
         {{ partial "commercial-hardware.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "consult" }}
         {{ partial "commercial-consulting.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "misc" }}
         {{ partial "commercial-misc.html" . }}
       {{ end }}
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html
index 3af630914e..5d7ac526d6 100644
--- a/website/themes/beastie/layouts/events/list.html
+++ b/website/themes/beastie/layouts/events/list.html
@@ -1,258 +1,264 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "upcomingFreeBSDEvents" }}>RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }}
 
       {{ $eventsData := "" }}
       {{ if (fileExists $eventsPath) -}}
         {{ $data := index .Site.Data $.Language.Lang }}
         {{ $eventsData = $data }}
       {{ else }}
         {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
         {{ $eventsData = $dataDefaultLanguage }}
       {{ end }}
 
       <!-- Load events and number of times -->
       {{ $countriesCodes := slice }}
       {{ $countriesCodesTimes := newScratch }}
 
       {{ with $eventsData }}
         {{ range (sort .events "year" "desc") }}
           {{ range .events }}
             {{ if .countryCode }}
               {{ $countriesCodes = $countriesCodes | append .countryCode }}
 
               {{ if $countriesCodesTimes.Get .countryCode }}
                 {{ $countriesCodesTimes.Add .countryCode 1 }}
               {{ else }}
                 {{ $countriesCodesTimes.Set .countryCode 1 }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ $countriesCodes = $countriesCodes | uniq }}
 
       {{ $countriesTimes := slice }}
       {{ range $element := $countriesCodes }}
         {{ $countriesTimes = $countriesTimes | append ($countriesCodesTimes.Get .) }}
       {{ end }}
 
       {{ $eventsImageUrl := (printf "https://chart.googleapis.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9&chd=t:%s&chld=%s" (delimit $countriesTimes ",") (delimit $countriesCodes "")) }}
 
       <img alt="events map" src={{ $eventsImageUrl }} />
 
       {{ $eventsCounter := 0 }}
 
       {{ if isset .Params "year" }}
         <!-- Nothing -->
       {{ else }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsCP := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsCP = $yearsMonthsCP | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Second load all past year-month to the array -->
         {{ $yearsMonthsPast := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsPast = $yearsMonthsPast | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonthsCP = $yearsMonthsCP | uniq }}
         {{ $yearsMonthsPast = $yearsMonthsPast | uniq }}
 
         <!-- Min year -->
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "asc") }}
                       {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsPast $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "desc") }}
                       {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ if isset .Params "year" }}
         {{ $year := .Params.year }}
         {{ $eventsYear := (printf "events%d" $year) }}
         {{ $eventsSelectedYear := index $eventsData.events $eventsYear }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsSelected := slice }}
 
         {{ with $eventsSelectedYear }}
           {{ range (sort .events "startDate" "asc") }}
             {{ $yearsMonthsSelected = $yearsMonthsSelected | append (dateFormat "2006-1" .endDate) }}
           {{ end }}
         {{ end }}
 
         {{ $yearsMonthsSelected = $yearsMonthsSelected | uniq }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $month := seq 12 1 }}
           {{ $yearMonth := (printf "%d-%d" $year $month) }}
           {{ if in $yearsMonthsSelected $yearMonth }}
             <h2>{{ i18n $month }} {{ $year }}</h2>
             {{ with $eventsSelectedYear }}
               <ul>
                 {{ range (sort .events "startDate" "desc") }}
                   {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                     <li id="{{ .id }}">
                       <p>
                         <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                         <br />
                         <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                         <br />
                         {{ .description | safeHTML }}
                       </p>
                     </li>
                     {{ $eventsCounter = add $eventsCounter 1 }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       <p>Events from past years:</p>
       <ul id="events-past-years">
         <li>
           <a href="2019/">2019</a>
         </li>
         <li>
           <a href="2018/">2018</a>
         </li>
         <li>
           <a href="2017/">2017</a>
         </li>
         <li>
           <a href="2016/">2016</a>
         </li>
         <li>
           <a href="2015/">2015</a>
         </li>
         <li>
           <a href="2014/">2014</a>
         </li>
         <li>
           <a href="2013/">2013</a>
         </li>
         <li>
           <a href="2012/">2012</a>
         </li>
         <li>
           <a href="2011/">2011</a>
         </li>
         <li>
           <a href="2010/">2010</a>
         </li>
         <li>
           <a href="2009/">2009</a>
         </li>
         <li>
           <a href="2008/">2008</a>
         </li>
         <li>
           <a href="2007/">2007</a>
         </li>
         <li>
           <a href="2006/">2006</a>
         </li>
         <li>
           <a href="2005/">2005</a>
         </li>
         <li>
           <a href="2004/">2004</a>
         </li>
         <li>
           <a href="2003/">2003</a>
         </li>
       </ul>
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html
index 3af630914e..5d7ac526d6 100644
--- a/website/themes/beastie/layouts/events/single.html
+++ b/website/themes/beastie/layouts/events/single.html
@@ -1,258 +1,264 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "upcomingFreeBSDEvents" }}>RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }}
 
       {{ $eventsData := "" }}
       {{ if (fileExists $eventsPath) -}}
         {{ $data := index .Site.Data $.Language.Lang }}
         {{ $eventsData = $data }}
       {{ else }}
         {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
         {{ $eventsData = $dataDefaultLanguage }}
       {{ end }}
 
       <!-- Load events and number of times -->
       {{ $countriesCodes := slice }}
       {{ $countriesCodesTimes := newScratch }}
 
       {{ with $eventsData }}
         {{ range (sort .events "year" "desc") }}
           {{ range .events }}
             {{ if .countryCode }}
               {{ $countriesCodes = $countriesCodes | append .countryCode }}
 
               {{ if $countriesCodesTimes.Get .countryCode }}
                 {{ $countriesCodesTimes.Add .countryCode 1 }}
               {{ else }}
                 {{ $countriesCodesTimes.Set .countryCode 1 }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ $countriesCodes = $countriesCodes | uniq }}
 
       {{ $countriesTimes := slice }}
       {{ range $element := $countriesCodes }}
         {{ $countriesTimes = $countriesTimes | append ($countriesCodesTimes.Get .) }}
       {{ end }}
 
       {{ $eventsImageUrl := (printf "https://chart.googleapis.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9&chd=t:%s&chld=%s" (delimit $countriesTimes ",") (delimit $countriesCodes "")) }}
 
       <img alt="events map" src={{ $eventsImageUrl }} />
 
       {{ $eventsCounter := 0 }}
 
       {{ if isset .Params "year" }}
         <!-- Nothing -->
       {{ else }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsCP := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsCP = $yearsMonthsCP | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Second load all past year-month to the array -->
         {{ $yearsMonthsPast := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsPast = $yearsMonthsPast | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonthsCP = $yearsMonthsCP | uniq }}
         {{ $yearsMonthsPast = $yearsMonthsPast | uniq }}
 
         <!-- Min year -->
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "asc") }}
                       {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsPast $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "desc") }}
                       {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ if isset .Params "year" }}
         {{ $year := .Params.year }}
         {{ $eventsYear := (printf "events%d" $year) }}
         {{ $eventsSelectedYear := index $eventsData.events $eventsYear }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsSelected := slice }}
 
         {{ with $eventsSelectedYear }}
           {{ range (sort .events "startDate" "asc") }}
             {{ $yearsMonthsSelected = $yearsMonthsSelected | append (dateFormat "2006-1" .endDate) }}
           {{ end }}
         {{ end }}
 
         {{ $yearsMonthsSelected = $yearsMonthsSelected | uniq }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $month := seq 12 1 }}
           {{ $yearMonth := (printf "%d-%d" $year $month) }}
           {{ if in $yearsMonthsSelected $yearMonth }}
             <h2>{{ i18n $month }} {{ $year }}</h2>
             {{ with $eventsSelectedYear }}
               <ul>
                 {{ range (sort .events "startDate" "desc") }}
                   {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                     <li id="{{ .id }}">
                       <p>
                         <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                         <br />
                         <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                         <br />
                         {{ .description | safeHTML }}
                       </p>
                     </li>
                     {{ $eventsCounter = add $eventsCounter 1 }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       <p>Events from past years:</p>
       <ul id="events-past-years">
         <li>
           <a href="2019/">2019</a>
         </li>
         <li>
           <a href="2018/">2018</a>
         </li>
         <li>
           <a href="2017/">2017</a>
         </li>
         <li>
           <a href="2016/">2016</a>
         </li>
         <li>
           <a href="2015/">2015</a>
         </li>
         <li>
           <a href="2014/">2014</a>
         </li>
         <li>
           <a href="2013/">2013</a>
         </li>
         <li>
           <a href="2012/">2012</a>
         </li>
         <li>
           <a href="2011/">2011</a>
         </li>
         <li>
           <a href="2010/">2010</a>
         </li>
         <li>
           <a href="2009/">2009</a>
         </li>
         <li>
           <a href="2008/">2008</a>
         </li>
         <li>
           <a href="2007/">2007</a>
         </li>
         <li>
           <a href="2006/">2006</a>
         </li>
         <li>
           <a href="2005/">2005</a>
         </li>
         <li>
           <a href="2004/">2004</a>
         </li>
         <li>
           <a href="2003/">2003</a>
         </li>
       </ul>
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html
index d9e3ac3e42..a09ce25d88 100644
--- a/website/themes/beastie/layouts/news/list.html
+++ b/website/themes/beastie/layouts/news/list.html
@@ -1,78 +1,84 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $newsDayCounter := 1 }}
         {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $newsDayCur := dateFormat "2006-01-02" .date }}
                       {{ if eq $newsDayCur $newsDayPrev }}
                         {{ $newsDayCounter = add $newsDayCounter 1 }}
                       {{ else }}
                         {{ $newsDayCounter = 1 }}
                       {{ end }}
                       <li>
                         <p class="localized">
                           <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
                       {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html
index d9e3ac3e42..a09ce25d88 100644
--- a/website/themes/beastie/layouts/news/single.html
+++ b/website/themes/beastie/layouts/news/single.html
@@ -1,78 +1,84 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $newsDayCounter := 1 }}
         {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $newsDayCur := dateFormat "2006-01-02" .date }}
                       {{ if eq $newsDayCur $newsDayPrev }}
                         {{ $newsDayCounter = add $newsDayCounter 1 }}
                       {{ else }}
                         {{ $newsDayCounter = 1 }}
                       {{ end }}
                       <li>
                         <p class="localized">
                           <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
                       {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/list.html b/website/themes/beastie/layouts/press/list.html
index 88c591492a..ee9fc61001 100644
--- a/website/themes/beastie/layouts/press/list.html
+++ b/website/themes/beastie/layouts/press/list.html
@@ -1,82 +1,88 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $pressMonthCounter := 1 }}
         {{ $pressMonthPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $pressMonthCur := dateFormat "2006-01" .date }}
                       {{ if eq $pressMonthCur $pressMonthPrev }}
                         {{ $pressMonthCounter = add $pressMonthCounter 1 }}
                       {{ else }}
                         {{ $pressMonthCounter = 1 }}
                       {{ end }}
                       <li>
                         <p>
                           <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
                       {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/single.html b/website/themes/beastie/layouts/press/single.html
index 88c591492a..ee9fc61001 100644
--- a/website/themes/beastie/layouts/press/single.html
+++ b/website/themes/beastie/layouts/press/single.html
@@ -1,82 +1,88 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $pressMonthCounter := 1 }}
         {{ $pressMonthPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $pressMonthCur := dateFormat "2006-01" .date }}
                       {{ if eq $pressMonthCur $pressMonthPrev }}
                         {{ $pressMonthCounter = add $pressMonthCounter 1 }}
                       {{ else }}
                         {{ $pressMonthCounter = 1 }}
                       {{ end }}
                       <li>
                         <p>
                           <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
                       {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/security/list.html b/website/themes/beastie/layouts/security/list.html
index fab09a2323..11f204d301 100644
--- a/website/themes/beastie/layouts/security/list.html
+++ b/website/themes/beastie/layouts/security/list.html
@@ -1,51 +1,57 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
       {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
     {{ if $.Params.security }}
       <table>
         <thead>
           <tr>
             <th>Date</th>
             {{ if eq $.Params.security "notices" }}
               <th>Errata Notice name</th>
             {{ end }}
             {{ if eq $.Params.security "advisories" }}
               <th>Advisory name</th>
             {{ end }}
           </tr>
         </thead>
         <tbody>
           {{ if eq $.Params.security "notices" }}
             {{ with .Site.Data.security.errata }}
               {{ range .notices }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absLangURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
           {{ if eq $.Params.security "advisories" }}
             {{ with .Site.Data.security.advisories }}
               {{ range .advisories }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absLangURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
         </tbody>
       </table>
     {{ end }}
+    {{ if .GitInfo }}
+    <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
   </div>
 </div>
 {{ end }}
 
diff --git a/website/themes/beastie/layouts/security/single.html b/website/themes/beastie/layouts/security/single.html
index fab09a2323..11f204d301 100644
--- a/website/themes/beastie/layouts/security/single.html
+++ b/website/themes/beastie/layouts/security/single.html
@@ -1,51 +1,57 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
       {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
     {{ if $.Params.security }}
       <table>
         <thead>
           <tr>
             <th>Date</th>
             {{ if eq $.Params.security "notices" }}
               <th>Errata Notice name</th>
             {{ end }}
             {{ if eq $.Params.security "advisories" }}
               <th>Advisory name</th>
             {{ end }}
           </tr>
         </thead>
         <tbody>
           {{ if eq $.Params.security "notices" }}
             {{ with .Site.Data.security.errata }}
               {{ range .notices }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absLangURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
           {{ if eq $.Params.security "advisories" }}
             {{ with .Site.Data.security.advisories }}
               {{ range .advisories }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absLangURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
         </tbody>
       </table>
     {{ end }}
+    {{ if .GitInfo }}
+    <hr />
+    <div class="last-modified">
+      <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+    </div>
+    {{ end }}
   </div>
 </div>
 {{ end }}
 
diff --git a/website/themes/beastie/layouts/usergroups/section.html b/website/themes/beastie/layouts/usergroups/section.html
index 49c48c10c5..2466fbb057 100644
--- a/website/themes/beastie/layouts/usergroups/section.html
+++ b/website/themes/beastie/layouts/usergroups/section.html
@@ -1,162 +1,167 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ $usergroupsPath := (printf "data/%s/usergroups/usergroups.toml" $.Language.Lang) }}
 
       {{ $usergroupsData := "" }}
       {{ if (fileExists $usergroupsPath) -}}
         {{ $data := index .Site.Data $.Language.Lang }}
         {{ $usergroupsData = $data.usergroups }}
       {{ else }}
         {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
         {{ $usergroupsData = $dataDefaultLanguage.usergroups }}
       {{ end }}
 
       <ul>
         <li>
           <a href="#europe">{{ i18n "europe" }}</a> ( {{ len $usergroupsData.usergroups.Europe }} user groups)
         </li>
         <li>
           <a href="#north-america">{{ i18n "northAmerica" }}</a> ( {{ len $usergroupsData.usergroups.NorthAmerica }} user groups)
         </li>
         <li>
           <a href="#asia">{{ i18n "asia" }}</a> ( {{ len $usergroupsData.usergroups.Asia }} user groups)
         </li>
         <li>
           <a href="#south-america">{{ i18n "southAmerica" }}</a> ( {{ len $usergroupsData.usergroups.SouthAmerica }} user groups)
         </li>
         <li>
           <a href="#oceania">{{ i18n "oceania" }}</a> ( {{ len $usergroupsData.usergroups.Oceania }} user groups)
         </li>
         <li>
           <a href="#global">{{ i18n "global" }}</a> ( {{ len $usergroupsData.usergroups.Global }} user groups)
         </li>
       </ul>
       <br />
 
       <!-- Load usergroups and number of them-->
       {{ $usergroupsCodes := slice }}
       {{ $usergroupsCodesTimes := newScratch }}
 
       {{ with $usergroupsData.usergroups }}
         {{ range . }}
           {{ range . }}
             {{ if .countryCode }}
               {{ $usergroupsCodes = $usergroupsCodes | append .countryCode }}
 
               {{ if $usergroupsCodesTimes.Get .countryCode }}
                 {{ $usergroupsCodesTimes.Add .countryCode 1 }}
               {{ else }}
                 {{ $usergroupsCodesTimes.Set .countryCode 1 }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ $usergroupsCodes = $usergroupsCodes | uniq }}
 
       {{ $usergroupsTimes := slice }}
       {{ range $element := $usergroupsCodes }}
         {{ $usergroupsTimes = $usergroupsTimes | append ($usergroupsCodesTimes.Get .) }}
       {{ end }}
 
       {{ $usergroupsImageUrl := (printf "https://chart.googleapis.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9&chd=t:%s&chld=%s" (delimit $usergroupsTimes ",") (delimit $usergroupsCodes "")) }}
 
       <img alt="Map with the usergroups" src={{ $usergroupsImageUrl }} />
 
       <h3 id="europe">{{ i18n "europe" }}</h3>
       {{ with $usergroupsData.usergroups }}
         <dl>
         {{ range (sort .Europe "name" "asc") }}
           <dt>
             <a href="{{ .url }}">{{ .name }}</a>
           </dt>
           <dd>
             <p id="{{ .id }}">{{ .description | safeHTML }}</p>
           </dd>
         {{ end }}
         </dl>
       {{ end }}
 
       <h3 id="north-america">{{ i18n "northAmerica" }}</h3>
       {{ with $usergroupsData.usergroups }}
         <dl>
         {{ range (sort .NorthAmerica "name" "asc") }}
           <dt>
             <a href="{{ .url }}">{{ .name }}</a>
           </dt>
           <dd>
             <p id="{{ .id }}">{{ .description | safeHTML }}</p>
           </dd>
         {{ end }}
         </dl>
       {{ end }}
 
       <h3 id="asia">{{ i18n "asia" }}</h3>
       {{ with $usergroupsData.usergroups }}
         <dl>
         {{ range (sort .Asia "name" "asc") }}
           <dt>
             <a href="{{ .url }}">{{ .name }}</a>
           </dt>
           <dd>
             <p id="{{ .id }}">{{ .description | safeHTML }}</p>
           </dd>
         {{ end }}
         </dl>
       {{ end }}
 
       <h3 id="oceania">{{ i18n "oceania" }}</h3>
       {{ with $usergroupsData.usergroups }}
         <dl>
         {{ range (sort .Oceania "name" "asc") }}
           <dt>
             <a href="{{ .url }}">{{ .name }}</a>
           </dt>
           <dd>
             <p id="{{ .id }}">{{ .description | safeHTML }}</p>
           </dd>
         {{ end }}
         </dl>
       {{ end }}
 
       <h3 id="south-america">{{ i18n "southAmerica" }}</h3>
       {{ with $usergroupsData.usergroups }}
         <dl>
         {{ range (sort .SouthAmerica "name" "asc") }}
           <dt>
             <a href="{{ .url }}">{{ .name }}</a>
           </dt>
           <dd>
             <p id="{{ .id }}">{{ .description | safeHTML }}</p>
           </dd>
         {{ end }}
         </dl>
       {{ end }}
 
       <h3 id="global">{{ i18n "global" }}</h3>
       {{ with $usergroupsData.usergroups }}
         <dl>
         {{ range (sort .Global "name" "asc") }}
           <dt>
             <a href="{{ .url }}">{{ .name }}</a>
           </dt>
           <dd>
             <p id="{{ .id }}">{{ .description | safeHTML }}</p>
           </dd>
         {{ end }}
         </dl>
       {{ end }}
-
+      {{ if .GitInfo }}
+      <hr />
+      <div class="last-modified">
+        <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
+      </div>
+      {{ end }}
     </div>
   </div>
 {{ end }}