diff --git a/extras/deploy-scripts/pandora_deploy_community.sh b/extras/deploy-scripts/pandora_deploy_community.sh
index f660d5338d..0601c90688 100644
--- a/extras/deploy-scripts/pandora_deploy_community.sh
+++ b/extras/deploy-scripts/pandora_deploy_community.sh
@@ -282,6 +282,8 @@ server_dependencies=" \
     expect \
 	openssh-clients \
     java \
+    bind-utils \
+    whois \
     http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
     http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
     https://firefly.artica.es/centos7/pandorawmic-1.0.0-1.x86_64.rpm"
diff --git a/extras/deploy-scripts/pandora_deploy_community_el8.sh b/extras/deploy-scripts/pandora_deploy_community_el8.sh
index a4a80af6c5..1103eb116a 100644
--- a/extras/deploy-scripts/pandora_deploy_community_el8.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_el8.sh
@@ -335,6 +335,8 @@ server_dependencies=" \
     expect \
     openssh-clients \
     java \
+    bind-utils \
+    whois \
     http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
     http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
     https://firefly.artica.es/centos8/pandorawmic-1.0.0-1.x86_64.rpm"
diff --git a/pandora_console/include/class/ExternalTools.class.php b/pandora_console/include/class/ExternalTools.class.php
index 58c021de17..4af91fe5cb 100644
--- a/pandora_console/include/class/ExternalTools.class.php
+++ b/pandora_console/include/class/ExternalTools.class.php
@@ -651,6 +651,12 @@ class ExternalTools extends HTML
                     }
                 break;
 
+                case 'whois':
+                    if (empty($snmpget_path) === false) {
+                        return $snmpget_path;
+                    }
+                break;
+
                 default:
                 return null;
             }
@@ -829,6 +835,7 @@ class ExternalTools extends HTML
                 if (empty($dig) === true) {
                     ui_print_error_message(__('Dig executable does not exist.'));
                 } else {
+                    $dig .= ' '.$ip;
                     $this->performExecution($dig);
                 }
 
@@ -837,6 +844,7 @@ class ExternalTools extends HTML
                 if (empty($whois) === true) {
                     ui_print_error_message(__('Whois executable does not exist.'));
                 } else {
+                    $whois .= ' '.$ip;
                     $this->performExecution($whois);
                 }