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