diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab45134..04031bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
            mkdir libdwarf
            cd libdwarf
            git init
-           git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
+           git remote add origin https://github.com/davea42/libdwarf-code.git
            git fetch --depth 1 origin 6216e185863f41d6f19ab850caabfff7326020d7
            git checkout FETCH_HEAD
            mkdir build
@@ -52,7 +52,7 @@ jobs:
            mkdir libdwarf
            cd libdwarf
            git init
-           git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
+           git remote add origin https://github.com/davea42/libdwarf-code.git
            git fetch --depth 1 origin 6216e185863f41d6f19ab850caabfff7326020d7
            git checkout FETCH_HEAD
            mkdir build
@@ -83,7 +83,7 @@ jobs:
            mkdir libdwarf
            cd libdwarf
            git init
-           git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
+           git remote add origin https://github.com/davea42/libdwarf-code.git
            git fetch --depth 1 origin 6216e185863f41d6f19ab850caabfff7326020d7
            git checkout FETCH_HEAD
            mkdir build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5ec85a1..624ec53 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
            mkdir libdwarf
            cd libdwarf
            git init
-           git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
+           git remote add origin https://github.com/davea42/libdwarf-code.git
            git fetch --depth 1 origin 6216e185863f41d6f19ab850caabfff7326020d7
            git checkout FETCH_HEAD
            mkdir build
@@ -53,7 +53,7 @@ jobs:
            mkdir libdwarf
            cd libdwarf
            git init
-           git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
+           git remote add origin https://github.com/davea42/libdwarf-code.git
            git fetch --depth 1 origin 6216e185863f41d6f19ab850caabfff7326020d7
            git checkout FETCH_HEAD
            mkdir build
@@ -88,7 +88,7 @@ jobs:
            mkdir libdwarf
            cd libdwarf
            git init
-           git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
+           git remote add origin https://github.com/davea42/libdwarf-code.git
            git fetch --depth 1 origin 6216e185863f41d6f19ab850caabfff7326020d7
            git checkout FETCH_HEAD
            mkdir build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5da1101..5816768 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -344,11 +344,13 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
     include(FetchContent)
     FetchContent_Declare(
       libdwarf
-      # GIT_REPOSITORY https://github.com/jeremy-rifkin/libdwarf-code.git
+      # GIT_REPOSITORY https://github.com/davea42/libdwarf-code.git
       # GIT_TAG 6216e185863f41d6f19ab850caabfff7326020d7 # v0.8.0
+      # GIT_TAG 8b0bd09d8c77d45a68cb1bb00a54186a92b683d9 # v0.9.0
       # Using a lightweight mirror that's optimized for clone + configure speed
       GIT_REPOSITORY https://github.com/jeremy-rifkin/libdwarf-lite.git
-      GIT_TAG c78e984f3abbd20f6e01d6f51819e826b1691f65
+      GIT_TAG c78e984f3abbd20f6e01d6f51819e826b1691f65 # v0.8.0
+      # GIT_TAG 71090c680b4c943448ba87a0f1f864f174e4edda # v0.9.0
       GIT_SHALLOW 1
     )
     FetchContent_MakeAvailable(libdwarf)