diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 004ec644..71d3ee2c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -119,7 +119,7 @@ jobs:
       - name: "➕ Setup Hugo"
         uses: peaceiris/actions-hugo@c03b5dbed22245418539b65eb9a3b1d5fdd9a0a6
         with:
-          hugo-version: '0.85.0'
+          hugo-version: '0.93.3'
           extended: true
       - name: "📥 Source checkout"
         uses: actions/checkout@v2
@@ -165,7 +165,7 @@ jobs:
       - name: "➕ Setup Hugo"
         uses: peaceiris/actions-hugo@c03b5dbed22245418539b65eb9a3b1d5fdd9a0a6
         with:
-          hugo-version: '0.85.0'
+          hugo-version: '0.93.3'
           extended: true
       - name: "📥 Source checkout"
         uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 19d619a5..d977c04e 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ place after an MSC has been accepted, not as part of a proposal itself.
 
 1. Install the extended version (often the OS default) of Hugo:
    <https://gohugo.io/getting-started/installing>. Note that at least Hugo
-   v0.74 is required.
+   v0.93.0 is required.
 
    Alternatively, use the Docker image at
    https://hub.docker.com/r/klakegg/hugo/. (The "extended edition" is required
diff --git a/layouts/shortcodes/cs-module.html b/layouts/shortcodes/cs-module.html
index bd407df6..7bb6f581 100644
--- a/layouts/shortcodes/cs-module.html
+++ b/layouts/shortcodes/cs-module.html
@@ -9,5 +9,5 @@
 
 {{ $name := .Params.name }}
 
-{{ $page := .Site.GetPage (path.Join .Page.Dir "modules" (printf "%s%s" $name ".md"))}}
-{{ $page.Content }}
\ No newline at end of file
+{{ $page := .Site.GetPage (path.Join .Page.File.Dir "modules" (printf "%s%s" $name ".md"))}}
+{{ $page.Content }}
diff --git a/layouts/shortcodes/rver-fragment.html b/layouts/shortcodes/rver-fragment.html
index 12c4d122..14a8a027 100644
--- a/layouts/shortcodes/rver-fragment.html
+++ b/layouts/shortcodes/rver-fragment.html
@@ -17,7 +17,7 @@
 {{ $name := .Params.name }}
 {{ $withVersioning := .Params.withVersioning }}
 
-{{ $page := .Site.GetPage (path.Join .Page.Dir "fragments" (printf "%s%s" $name ".md"))}}
+{{ $page := .Site.GetPage (path.Join .Page.File.Dir "fragments" (printf "%s%s" $name ".md"))}}
 {{ $content := $page.Content }}
 {{ if not $withVersioning }}
     {{ $content = (replace $content "[New in this version]" "") }}