diff --git a/omd/packages/rrdtool/BUILD b/omd/packages/rrdtool/BUILD
index ecc6243c03d..f54e520edd0 100644
--- a/omd/packages/rrdtool/BUILD
+++ b/omd/packages/rrdtool/BUILD
@@ -6,6 +6,12 @@ load("//bazel/rules:package_wheel.bzl", "package_wheel")
 rrd_cli_tools = [
     "rrdtool",
     "rrdcached",
+    "rrdupdate",
+]
+
+rrd_cli_symlinks = [
+    "rrdcreate",
+    "rrdinfo",
 ]
 
 [genrule(
@@ -39,6 +45,15 @@ pkg_files(
     prefix = "lib",
 )
 
+[
+    pkg_mklink(
+        name = "%s_symlink" % b,
+        link_name = "bin/%s" % b,
+        target = "bin/rrdupdate",
+    )
+    for b in rrd_cli_symlinks
+]
+
 pkg_mklink(
     name = "librrd_symlink",
     # The "8" is the version of the library - no idea yet how to get this
@@ -53,7 +68,7 @@ pkg_filegroup(
         ":rrdtool_bin",
         ":rrdtool_lib",
         ":rrdtool_skel_pkg",
-    ],
+    ] + ["%s_symlink" % b for b in rrd_cli_symlinks],
     visibility = ["//visibility:public"],
 )
 
diff --git a/tests/integration/omd/test_rrdtool.py b/tests/integration/omd/test_rrdtool.py
index 451e9a1753f..acfe7e2656d 100644
--- a/tests/integration/omd/test_rrdtool.py
+++ b/tests/integration/omd/test_rrdtool.py
@@ -199,6 +199,9 @@ def test_cli_xport(
     [
         (["rrdtool"], 0, "RRDtool"),
         (["rrdcached", "--help"], 1, "RRDCacheD"),
+        (["rrdupdate"], 1, "RRDtool"),
+        (["rrdcreate"], 1, "RRDtool"),
+        (["rrdinfo"], 1, "RRDtool"),
     ],
 )
 def test_additional_cli_tools(