diff --git a/documentation/config/_default/config.toml b/documentation/config/_default/config.toml
index 17f8bb41dd..8795386966 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
 googleAnalytics = 'UA-22767463-1'
 
 [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/layouts/articles/list.html b/documentation/themes/beastie/layouts/articles/list.html
index d79f13bb32..8719a9cc87 100644
--- a/documentation/themes/beastie/layouts/articles/list.html
+++ b/documentation/themes/beastie/layouts/articles/list.html
@@ -1,54 +1,57 @@
 {{ 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 }}
   </div>
   <aside class="toc">
     <div class="toc-content">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
       <hr />
       <div class="resources">
         <h3>{{ i18n "resources" }}</h3>
         <ul class="contents">
-          <!--<li><a href="#"><i class="fa fa-file-pdf-o" aria-hidden="true"></i>{{ i18n "download-pdf" }}</a></li>-->
+          {{ $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><a href="{{ $editUrl }}" target="_blank"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>{{ i18n "edit-page" }}</a></li>
+          <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 d79f13bb32..8719a9cc87 100644
--- a/documentation/themes/beastie/layouts/articles/single.html
+++ b/documentation/themes/beastie/layouts/articles/single.html
@@ -1,54 +1,57 @@
 {{ 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 }}
   </div>
   <aside class="toc">
     <div class="toc-content">
       <h3>{{ i18n "toc" }}</h3>
       {{ .TableOfContents }}
       <hr />
       <div class="resources">
         <h3>{{ i18n "resources" }}</h3>
         <ul class="contents">
-          <!--<li><a href="#"><i class="fa fa-file-pdf-o" aria-hidden="true"></i>{{ i18n "download-pdf" }}</a></li>-->
+          {{ $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><a href="{{ $editUrl }}" target="_blank"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>{{ i18n "edit-page" }}</a></li>
+          <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 fc99508c90..95f282804d 100644
--- a/documentation/themes/beastie/layouts/books/list.html
+++ b/documentation/themes/beastie/layouts/books/list.html
@@ -1,136 +1,139 @@
 {{ 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 }}
     <div class="book-content">
       {{ .Content }}
     </div>
     <hr />
     <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">
-          <!--<li><a href="#"><i class="fa fa-file-pdf-o" aria-hidden="true"></i>{{ i18n "download-pdf" }}</a></li>-->
+          {{ $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 fc99508c90..95f282804d 100644
--- a/documentation/themes/beastie/layouts/books/single.html
+++ b/documentation/themes/beastie/layouts/books/single.html
@@ -1,136 +1,139 @@
 {{ 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 }}
     <div class="book-content">
       {{ .Content }}
     </div>
     <hr />
     <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">
-          <!--<li><a href="#"><i class="fa fa-file-pdf-o" aria-hidden="true"></i>{{ i18n "download-pdf" }}</a></li>-->
+          {{ $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 }}