diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml
index a23c9be..0311bc2 100644
--- a/.github/workflows/ghpages.yml
+++ b/.github/workflows/ghpages.yml
@@ -21,7 +21,7 @@ jobs:
         Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx.zip" -OutFile ".tools/docfx/docfx.zip"
         [System.IO.Compression.ZipFile]::ExtractToDirectory(".tools/docfx/docfx.zip", ".tools/docfx" )
       env:
-        DOCFXVERSION: 2.56.7
+        DOCFXVERSION: 2.58
 
     - name: Install .NET OMD Generator
       run: dotnet tool install --tool-path .tools/omd dotMorten.OmdGenerator --version 1.2.0
@@ -38,7 +38,7 @@ jobs:
       env:         
         DOCFX_SOURCE_BRANCH_NAME: main
       run: |
-        nuget install memberpage -Version 2.56.7 -OutputDirectory docs
+        nuget install memberpage -Version 2.58.0 -OutputDirectory docs
         .tools/docfx/docfx.exe metadata docs/docfx.json
         dotnet build docs/AppliesToGenerator\DocFXAppliesToGenerator.csproj
         docs/AppliesToGenerator\bin\Debug\netcoreapp3.1\DocFXAppliesToGenerator.exe docs/appliesToList.json
diff --git a/.gitignore b/.gitignore
index d4c738f..9afbb0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,5 +113,5 @@ project.lock.json
 src/.vs/
 artifacts
 .tools
-docs/memberpage.2.56.7
+docs/memberpage.2.58.0
 docs/AppliesToGenerator/.vs
diff --git a/docs/BuildDoc.cmd b/docs/BuildDoc.cmd
index 26d8b1c..2ad63e3 100644
--- a/docs/BuildDoc.cmd
+++ b/docs/BuildDoc.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 
-SET DocFXVersion=2.56.7
+SET DocFXVersion=2.58
 SET DocFxFolder=%~dp0..\.tools\docfx
 
 REM Download DocFx
@@ -20,7 +20,7 @@ dotnet tool install --tool-path %~dp0../.tools/omd dotMorten.OmdGenerator --vers
 mkdir %~dp0../artifacts/docs/api
 %~dp0..\.tools\omd\generateomd /source=%~dp0../src/NmeaParser /output=%~dp0../artifacts/docs/api/omd.html /preprocessors=NETSTANDARD1_4;NETSTANDARD
 
-%~dp0..\.tools\nuget install memberpage -Version 2.56.7 -OutputDirectory %~dp0
+%~dp0..\.tools\nuget install memberpage -Version 2.58.0 -OutputDirectory %~dp0
 REM Build the output site (HTML) from the generated metadata and input files (uses configuration in docfx.json in this folder)
 %DocFxFolder%\v%DocFXVersion%\docfx.exe metadata %~dp0\docfx.json
 
@@ -33,4 +33,4 @@ AppliesToGenerator\bin\Debug\netcoreapp3.1\DocFXAppliesToGenerator.exe appliesTo
 ECHO Fixing API Reference Links
 powershell -ExecutionPolicy ByPass -command "%~dp0FixApiRefLinks.ps1" -Path %~dp0..\artifacts\docs_site\api\
 start http://localhost:8080
-%DocFxFolder%\v%DocFXVersion%\docfx.exe serve %~dp0..\artifacts\docs_site\
\ No newline at end of file
+%DocFxFolder%\v%DocFXVersion%\docfx.exe serve %~dp0..\artifacts\docs_site\
diff --git a/docs/docfx.json b/docs/docfx.json
index b10f0f8..b8c2e0f 100644
--- a/docs/docfx.json
+++ b/docs/docfx.json
@@ -134,7 +134,7 @@
     "fileMetadataFiles": [],
     "template": [
       "default",
-      "memberpage.2.56.7/content",
+      "memberpage.2.58.0/content",
       "template_overrides"
     ],
     "postProcessors": [],