diff --git a/pkg/deb/conf/keydb.conf b/pkg/deb/conf/keydb.conf
index 41db10573..20df32e42 100644
--- a/pkg/deb/conf/keydb.conf
+++ b/pkg/deb/conf/keydb.conf
@@ -2035,9 +2035,9 @@ server-threads 2
 # bringing up replicas can result in data loss (the first master will win).
 # active-replica yes
 
-# Enable Enterprise?  KeyDB Enterprise provides support for Enterprise only features
-#   note: you may omit the license key to demo Enterprise features for a limited time
-# enable-enterprise [License Key]
+# Enable Pro?  KeyDB pro provides support for pro only features
+#   note: you may omit the license key to demo pro features for a limited time
+# enable-pro [License Key]
 
-# Enable FLASH support? (Enterprise Only)
+# Enable FLASH support? (Pro Only)
 # storage-provider flash /path/to/flash/db
diff --git a/pkg/deb/debian/keydb-enterprise-tools.install b/pkg/deb/debian/keydb-enterprise-tools.install
index 166faeafd..3cdaf4328 100644
--- a/pkg/deb/debian/keydb-enterprise-tools.install
+++ b/pkg/deb/debian/keydb-enterprise-tools.install
@@ -5,3 +5,4 @@ src/keydb-check-rdb	/usr/bin
 src/keydb-cli		/usr/bin
 src/keydb-server	/usr/bin
 src/keydb-sentinel	/usr/bin
+src/keydb-diagnostic-tool	/usr/bin
diff --git a/pkg/deb/debian_dh9/keydb-enterprise-tools.install b/pkg/deb/debian_dh9/keydb-enterprise-tools.install
index 166faeafd..3cdaf4328 100644
--- a/pkg/deb/debian_dh9/keydb-enterprise-tools.install
+++ b/pkg/deb/debian_dh9/keydb-enterprise-tools.install
@@ -5,3 +5,4 @@ src/keydb-check-rdb	/usr/bin
 src/keydb-cli		/usr/bin
 src/keydb-server	/usr/bin
 src/keydb-sentinel	/usr/bin
+src/keydb-diagnostic-tool	/usr/bin
diff --git a/pkg/rpm/generate_rpms.sh b/pkg/rpm/generate_rpms.sh
index 925509935..4069267f0 100755
--- a/pkg/rpm/generate_rpms.sh
+++ b/pkg/rpm/generate_rpms.sh
@@ -25,7 +25,13 @@ mkdir -p $DIR/keydb_build/keydb_rpm/var/log/keydb
 
 # move binaries to bin
 rm $DIR/keydb_build/keydb_rpm/usr/bin/*
-cp $DIR/../../src/keydb-* $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-server $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-sentinel $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-cli $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-benchmark $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-check-aof $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-check-rdb $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-diagnostic-tool $DIR/keydb_build/keydb_rpm/usr/bin/
 
 # update spec file with build info
 sed -i '2d' $DIR/keydb_build/keydb.spec
diff --git a/pkg/rpm/keydb_build/keydb_rpm/etc/keydb/keydb.conf b/pkg/rpm/keydb_build/keydb_rpm/etc/keydb/keydb.conf
index f7ba65fad..4cf07d280 100644
--- a/pkg/rpm/keydb_build/keydb_rpm/etc/keydb/keydb.conf
+++ b/pkg/rpm/keydb_build/keydb_rpm/etc/keydb/keydb.conf
@@ -2035,9 +2035,9 @@ server-threads 2
 # bringing up replicas can result in data loss (the first master will win).
 # active-replica yes
 
-# Enable Enterprise?  KeyDB Enterprise provides support for Enterprise only features
-#   note: you may omit the license key to demo Enterprise features for a limited time
-# enable-enterprise [License Key]
+# Enable Pro?  KeyDB pro provides support for pro only features
+#   note: you may omit the license key to demo pro features for a limited time
+# enable-pro [License Key]
 
-# Enable FLASH support? (Enterprise Only)
+# Enable FLASH support? (Pro Only)
 # storage-provider flash /path/to/flash/db
diff --git a/src/keydb-diagnostic-tool.cpp b/src/keydb-diagnostic-tool.cpp
index 06e6d938a..74b46ce83 100644
--- a/src/keydb-diagnostic-tool.cpp
+++ b/src/keydb-diagnostic-tool.cpp
@@ -211,6 +211,11 @@ extern "C" void _serverAssert(const char *estr, const char *file, int line) {
     *((char*)-1) = 'x';
 }
 
+/* asyncFreeDictTable is needed by dict */
+extern "C" void asyncFreeDictTable(struct dictEntry **de) {
+    zfree(de);
+}
+
 static redisContext *getRedisContext(const char *ip, int port,
                                      const char *hostsocket)
 {