--- CMakeLists.txt.orig	2026-09-16 20:06:49 UTC
+++ CMakeLists.txt
@@ -86,7 +86,7 @@ endif()
         endif()
 endif()
 
-set(BINDIR usr/sbin)
+set(BINDIR sbin)
 set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}")
 # This can be changed depending on the platform with the include below
 include(NetdataPlatform)
@@ -175,27 +175,21 @@ endif()
   string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}")
 endif()
 
-set(CACHE_DIR "${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")
-set(CONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/etc/netdata")
-set(LIBCONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")
-set(LOG_DIR "${NETDATA_RUNTIME_PREFIX}/var/log/netdata")
-set(PLUGINS_DIR "${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata/plugins.d")
+set(CACHE_DIR "%%NETDATA_CACHE%%")
+set(CONFIG_DIR "%%ETCDIR%%")
+set(LIBCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/netdata/conf.d")
+set(LOG_DIR "%%NETDATA_LOG%%")
+set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/libexec/netdata/plugins.d")
 set(STOCK_DATA_DEST "share/netdata")
-set(STOCK_DATA_DIR "${NETDATA_RUNTIME_PREFIX}/${STOCK_DATA_DEST}")
-set(VARLIB_DIR "${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")
-set(NETDATA_BIN_DIR "${NETDATA_RUNTIME_PREFIX}/${BINDIR}")
-if(NOT DEFINED NETDATA_TOPOLOGY_IP_INTEL_STOCK_DIR)
-  set(NETDATA_TOPOLOGY_IP_INTEL_STOCK_DIR "")
-endif()
+set(STOCK_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/netdata")
+set(VARLIB_DIR "%%NETDATA_PERST%%")
+set(NETDATA_BIN_DIR "${CMAKE_INSTALL_PREFIX}/sbin")
 
-# A non-default value is only used when building Debian packages (/var/lib/netdata/www)
 if(NOT DEFINED WEB_DIR)
   set(WEB_DIR "share/netdata/web")
-else()
-  string(REGEX REPLACE "^/" "" WEB_DIR "${WEB_DIR}")
 endif()
 set(WEB_DEST "${WEB_DIR}")
-set(WEB_DIR "${NETDATA_RUNTIME_PREFIX}/${WEB_DEST}")
+set(WEB_DIR "${CMAKE_INSTALL_PREFIX}/${WEB_DEST}")
 
 # This is intended to make life easier for developers who are working on one
 # specific feature.
@@ -325,14 +319,9 @@ if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN
 
 # Setup Rust/Corrosion for plugins that need it
 if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL OR ENABLE_PLUGIN_NETFLOW)
-    include(FetchContent)
-    FetchContent_Declare(
-        Corrosion
-        GIT_REPOSITORY https://github.com/netdata/corrosion.git
-        GIT_TAG f3b91559efca32c6b54837866ef35ba98ff5b2ca # stable/v0.5
-    )
-    FetchContent_MakeAvailable(Corrosion)
 
+    find_package(Corrosion REQUIRED)
+
     # Corrosion places cargo build artifacts under ${CMAKE_BINARY_DIR}/cargo/
     # (see Corrosion.cmake cargo_target_dir). Register it for cleanup so that
     # `ninja clean` removes it.  If a future Corrosion version changes this
@@ -4060,9 +4049,9 @@ install(DIRECTORY COMPONENT netdata DESTINATION ${WEB_
 install(DIRECTORY COMPONENT netdata DESTINATION libexec/netdata/plugins.d)
 install(DIRECTORY COMPONENT netdata DESTINATION ${WEB_DEST})
 
-set(libsysdir_POST "${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/system")
-set(pkglibexecdir_POST "${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata")
-set(localstatedir_POST "${NETDATA_RUNTIME_PREFIX}/var")
+set(libsysdir_POST "${CMAKE_INSTALL_PREFIX}/lib/netdata/system")
+set(pkglibexecdir_POST "${CMAKE_INSTALL_PREFIX}/libexec/netdata")
+set(localstatedir_POST "/var")
 set(sbindir_POST "${NETDATA_BIN_DIR}")
 set(configdir_POST "${CONFIG_DIR}")
 set(libconfigdir_POST "${LIBCONFIG_DIR}")
@@ -4331,7 +4320,7 @@ else()
 if(BUILD_FOR_PACKAGING)
         set(NETDATA_CONF_DEST "etc/netdata")
 else()
-        set(NETDATA_CONF_DEST "usr/lib/netdata/conf.d")
+        set(NETDATA_CONF_DEST "lib/netdata/conf.d")
 endif()
 
 #