diff --git a/_data/external_links.yml b/_data/external_links.yml
index 7643ed81..eb932b2a 100644
--- a/_data/external_links.yml
+++ b/_data/external_links.yml
@@ -384,6 +384,16 @@ gh-hy:
   url: https://github.com/hylang/hy
   title: [ "hy" ]
 
+gh-libdbi-master:
+  id: gh-libdbi-master
+  url: https://github.com/balabit-deps/libdbi/tree/master
+  title: [ "libdbi master" ]
+  
+gh-libdbi-drivers:
+ id: gh-libdbi-drivers
+ url: https://github.com/balabit-deps/libdbi-drivers
+ title: [ "libdbi drivers" ]
+
 gh-mon-src:
   id: gh-mon-src
   url: https://github.com/syslog-ng/syslog-ng-incubator/tree/master/modules/monitor-source/
diff --git a/_includes/doc/admin-guide/notes/libdb-driver.md b/_includes/doc/admin-guide/notes/libdb-driver.md
new file mode 100644
index 00000000..3019a0dd
--- /dev/null
+++ b/_includes/doc/admin-guide/notes/libdb-driver.md
@@ -0,0 +1,2 @@
+**NOTE:** Make sure to access libdbi from the libdbi master and libdbi drivers repositories, dedicated for {{ site.product.short_name }}. Using versions from other sources can cause a malfunction.
+{: .notice--info}
\ No newline at end of file
diff --git a/doc/_admin-guide/030_Installing_syslog-ng/001_Compiling_options.md b/doc/_admin-guide/030_Installing_syslog-ng/001_Compiling_options.md
index db74e225..378fb458 100644
--- a/doc/_admin-guide/030_Installing_syslog-ng/001_Compiling_options.md
+++ b/doc/_admin-guide/030_Installing_syslog-ng/001_Compiling_options.md
@@ -101,6 +101,8 @@ compiling options.
     if the libdbi library version 0.9 or newer is installed and
     detected).
 
+{% include doc/admin-guide/notes/libdb-driver.md %}
+
 - *\--enable-ssl* Enable SSL support, required for encrypted message
     transfer, as well as template functions that calculate hashes and
     UUIDs (enabled automatically if the libopenssl library is detected).
diff --git a/doc/_dev-guide/chapter_4/section_2/README.md b/doc/_dev-guide/chapter_4/section_2/README.md
index 82dc744c..2f28a3ac 100644
--- a/doc/_dev-guide/chapter_4/section_2/README.md
+++ b/doc/_dev-guide/chapter_4/section_2/README.md
@@ -230,13 +230,16 @@ sudo port install \
 > * `bison` is required because the version provided by Apple Developer Tools is incomplete (e.g., missing the `-W` option). The reason bison needs to be installed via a package manager is that the `-W` option is supported only in versions after 2.3.
 > * `net-snmp` might also be needed because the options provided by Apple Developer Tools are somewhat incorrect. The reason Net-SNMP might be required from a package manager is that the default `pkg-config` may return incorrect library and include paths.
 > * `openssl` - since macOS provides LibreSSL by default, you may need to expand the search path of `pkg-config` to find the newly installed OpenSSL. (This seems to have been an issue only with OpenSSL version 1.1.x.)
-> * `libdbi` and `libdbi-drivers` are [[maintained and updated|dev-macos-mod-sup-afsql#dependencies]] in {{ site.product.short_name }} repositories, use the latest master version from there
+> * `libdbi` and `libdbi-drivers` are [[maintained and updated|dev-macos-mod-sup-afsql#dependencies]] in {{ site.product.short_name }} repositories, use the latest master version from there. For the repository links, see the note below.
+
 > * `libesmtp` - Homebrew does not have libesmtp package support yet, but you can build it yourself from source or use the MacPorts version
 > * `riemann-client` - MacPorts does not have riemann-client package support yet, but you can build it yourself from source or use the HomeBrew version
 > * `gcc` - see at [compiler selection](#select-the-compiler)
 > * actual state of supported features and the required dependencies can also be found [[here|dev-macos-mod-sup-status]].
 {: .notice}
 
+{% include doc/admin-guide/notes/libdb-driver.md %}
+
 ### Preparations
 
 #### Using Homebrew
diff --git a/doc/_dev-guide/chapter_4/section_2/macos-testing-status/afsql.md b/doc/_dev-guide/chapter_4/section_2/macos-testing-status/afsql.md
index c535b008..2585573b 100644
--- a/doc/_dev-guide/chapter_4/section_2/macos-testing-status/afsql.md
+++ b/doc/_dev-guide/chapter_4/section_2/macos-testing-status/afsql.md
@@ -17,11 +17,7 @@ id: dev-macos-mod-sup-afsql
 
 This driver has multilevel dependencies. To compile the driver needs the libdbi and libdbi-drivers packages, which are supported and updated in the OSE forks,`and`should work nicely both on ARM and X86 macOS systems now (tested on macOS 13.3.1 and 12.6.4)
 
-Please do not use the pre-built ones (e.g. 0.9.0 from Homebrew), build from the **master** of the following
-{: .notice--info}
-
-* [https://github.com/balabit-deps/libdbi-drivers](https://github.com/balabit-deps/libdbi-drivers)
-* [https://github.com/balabit-deps/libdbi](https://github.com/balabit-deps/libdbi)
+{% include doc/admin-guide/notes/libdb-driver.md %}
 
 To use a given database system you need the corresponding supporting system-specific packages as well. 
 
diff --git a/doc/_dev-guide/chapter_4/section_3/README.md b/doc/_dev-guide/chapter_4/section_3/README.md
index 4608ad1e..b753feb4 100644
--- a/doc/_dev-guide/chapter_4/section_3/README.md
+++ b/doc/_dev-guide/chapter_4/section_3/README.md
@@ -60,6 +60,8 @@ The above mentioned dependencies can be satisfied by compiling every-each libs a
    * criterion
    * gcc14 - See [below](#packages-note)!
 
+{% include doc/admin-guide/notes/libdb-driver.md %}
+
 This is how it might look like if you start from the ground:
 
 ```shell