diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 5181cd6fff..79e4c67e0a 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-22  Junichi Satoh  <junichi@rworks.jp>
+
+	* lib/PandoraFMS/NetworkServer.pm: Deleted Solaris specific SNMPGET
+	definition. It is the same as Linux.
+	
 2010-10-22  Junichi Satoh  <junichi@rworks.jp>
 
 	* lib/PandoraFMS/Tools.pm: Changed ping count to for() loop instead of
diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm
index caa543e60d..cb542858dd 100644
--- a/pandora_server/lib/PandoraFMS/NetworkServer.pm
+++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm
@@ -269,12 +269,7 @@ sub pandora_snmp_get_command ($$$$$$$$$) {
         }
     }
 
-    # Need to implement
-    elsif ($OSNAME eq "solaris"){
-        $output = "";
-    }
-
-    # by default LINUX/FreeBSD calls
+    # by default LINUX/FreeBSD/Solaris calls
     else {
         if ($snmp_version ne "3"){
             $output = `$snmpget_cmd -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -c '$snmp_community' $snmp_target $snmp_oid 2>/dev/null`;