diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7eb09a7..3abf1c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,10 +314,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
   target_compile_definitions(cpptrace PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
   if(CPPTRACE_USE_SYSTEM_LIBDWARF)
     find_package(libdwarf REQUIRED)
-    target_link_libraries(cpptrace PRIVATE libdwarf::libdwarf)
-    # TODO: Temp hack
-    #target_include_directories(cpptrace PRIVATE "${CMAKE_INSTALL_INCLUDEDIR}/libdwarf")
-    target_include_directories(cpptrace PRIVATE "/usr/local/include/libdwarf/")
+    target_link_libraries(cpptrace PRIVATE libdwarf)
   else()
     add_subdirectory(bundled/libdwarf)
     target_link_libraries(cpptrace PRIVATE dwarf)
diff --git a/README.md b/README.md
index 88b45be..2814243 100644
--- a/README.md
+++ b/README.md
@@ -545,6 +545,7 @@ Back-end configuration:
   injection).
 - `CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH=On/Off`: Specifies whether cpptrace should let the system search the PATH
   environment variable directories for the binary.
+- `CPPTRACE_USE_SYSTEM_LIBDWARF=On/Off`: Use libdwarf resolved via `find_package` rather than the bundled libdwarf.
 
 Testing:
 - `CPPTRACE_BUILD_TEST` Build a small test program