diff --git a/config.php.default b/config.php.default
index 5091819b1f..7a39c92037 100755
--- a/config.php.default
+++ b/config.php.default
@@ -33,6 +33,9 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
 $config['nets'][] = "172.22.0.0/16";
 $config['nets'][] = "192.168.0.0/24";
 
+### Use the new Unix Agent (ALPHA)
+$config['poller_modules']['unix-agent']                   = 0;
+
 include("includes/static-config.php");
 
 ?>
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 84fde78e1a..fa810897c6 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -215,6 +215,15 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
+    if ($config['poller_modules']['unix-agent'] && @dbFetchCell("SELECT COUNT(*) FROM `packages` WHERE device_id = '".$device['device_id']."'") > '0')
+    {
+      echo('<li class="' . $select['packages'] . '">
+    <a href="'.generate_device_url($device, array('tab' => 'packages')).'">
+      <img src="images/16/box.png" align="absmiddle" border="0" /> Packages
+    </a>
+  </li>');
+    }
+
     if ($config['enable_inventory'] && @dbFetchCell("SELECT * FROM `entPhysical` WHERE device_id = '".$device['device_id']."'") > '0')
     {
       echo('<li class="' . $select['entphysical'] . '">
diff --git a/html/pages/device/packages.inc.php b/html/pages/device/packages.inc.php
new file mode 100644
index 0000000000..cf22a35136
--- /dev/null
+++ b/html/pages/device/packages.inc.php
@@ -0,0 +1,27 @@
+<?php
+
+echo('<table cellspacing="0" cellpadding="5" width="100%">');
+
+$i=0;
+foreach (dbFetchRows("SELECT * FROM `packages` WHERE `device_id` = ? ORDER BY `name`", array($device['device_id'])) as $entry)
+{
+  if (!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
+  echo("<tr bgcolor=$row_colour>");
+  echo('<td width=200><a href="'. generate_url($vars, array('name' => $entry['name'])).'">'.$entry['name'].'</a></td>');
+
+  echo("<td>".$entry['version']."-".$entry['build']."</td>");
+
+  echo("<td>".$entry['arch']."</td>");
+  echo("<td>".$entry['manager']."</td>");
+  echo("<td>".format_si($entry['size'])."</td>");
+
+
+  echo("</tr>");
+
+  $i++;
+
+}
+
+echo("</table>");
+
+?>
diff --git a/html/pages/packages.inc.php b/html/pages/packages.inc.php
new file mode 100644
index 0000000000..173c7af58b
--- /dev/null
+++ b/html/pages/packages.inc.php
@@ -0,0 +1,63 @@
+<?php
+
+foreach ($vars as $var => $value)
+{
+  if ($value != "")
+  {
+    switch ($var)
+    {
+      case 'name':
+        $where .= " AND `$var` LIKE ?";
+        $param[] = "%".$value."%";
+        break;
+    }
+  }
+}
+
+echo('<table cellspacing="0" cellpadding="5" width="100%">');
+
+$i=0;
+foreach (dbFetchRows("SELECT * FROM `packages` WHERE 1 $where GROUP BY `name`", $param) as $entry)
+{
+  if (!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
+  echo("<tr bgcolor=$row_colour>");
+  echo('<td width=200><a href="'. generate_url($vars, array('name' => $entry['name'])).'">'.$entry['name'].'</a></td>');
+
+  echo("<td>");
+  foreach (dbFetchRows("SELECT * FROM `packages` WHERE `name` = ? ORDER BY version, build", array($entry['name'])) as $entry_v)
+  {
+    $entry['blah'][$entry_v['version']][$entry_v['build']][$entry_v['device_id']] = 1;
+  }
+
+  foreach ($entry['blah'] as $version => $bleu) 
+  {
+
+    $content = '<div style="width: 800px;">';
+
+    foreach ($bleu as $build => $bloo)
+    {
+      $content .= '<div style="background-color: #eeeeee; margin: 5px;"><span style="font-weight: bold; ">'.$version.'-'.$build.'</span>';
+      foreach ($bloo as $device_id => $no)
+      {
+        $this_device = device_by_id_cache($device_id);
+        $content .= '<span style="background-color: #f5f5f5; margin: 5px;">'.$this_device['hostname'].'</span> ';
+
+      }
+      $content .= "</div>";
+    }
+    $content .= "</div>";
+
+    echo("<span style='margin:5px;'>".overlib_link("", $version, $content,  NULL)."</span>");
+  }
+
+  echo("<td>");
+
+  echo("</tr>");
+
+  $i++;
+
+}
+
+echo("</table>");
+
+?>
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 0338448c05..f1e56c5518 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -388,6 +388,7 @@ $config['poller_modules']['cisco-ace-loadbalancer']       = 1;
 $config['poller_modules']['cisco-ace-serverfarms']	  = 1;
 $config['poller_modules']['netscaler-vsvr']               = 1;
 $config['poller_modules']['entity-physical']              = 1;
+$config['poller_modules']['unix-agent']                   = 0;
 
 ## List of discovery modules. Need to be in this array to be
 ## considered for execution.
diff --git a/includes/polling/unix-agent.inc.php b/includes/polling/unix-agent.inc.php
new file mode 100755
index 0000000000..35950c9bac
--- /dev/null
+++ b/includes/polling/unix-agent.inc.php
@@ -0,0 +1,120 @@
+<?php
+
+if($device['os_group'] == "unix") {
+
+echo("Observium *nix Agent: ");
+
+$port='6556';
+
+$agent = fsockopen($device['hostname'], $port, $errno, $errstr, 10);
+
+if(!$agent)
+{
+  echo "failed";
+  exit();
+} else {
+  while (!feof($agent)) 
+  { 
+    $agent_raw .= fgets($agent, 128); 
+  } 
+}
+
+if(!empty($agent_raw))
+{
+  foreach(explode("<<<", $agent_raw) as $section)
+  {
+
+    list($section, $data) = explode(">>>", $section);
+    $agent_data[$section] = trim($data);
+  }
+
+  if(!empty($agent_data['rpm']))
+  {
+    echo("RPM Packages ");
+    ## Build array of existing packages
+    $manager = "rpm";
+
+    $pkgs_db_db = dbFetchRows("SELECT * FROM `packages` WHERE `device_id` = ?", array($device['device_id']));
+    foreach ($pkgs_db_db as $pkg_db) 
+    { 
+      $pkgs_db[$pkg_db['manager']][$pkg_db['name']][$pkg_db['arch']][$pkg_db['version']][$pkg_db['build']]['id'] = $pkg_db['pkg_id'];
+      $pkgs_db[$pkg_db['manager']][$pkg_db['name']][$pkg_db['arch']][$pkg_db['version']][$pkg_db['build']]['status'] = $pkg_db['status'];
+      $pkgs_db[$pkg_db['manager']][$pkg_db['name']][$pkg_db['arch']][$pkg_db['version']][$pkg_db['build']]['size'] = $pkg_db['size'];
+      $pkgs_db_id[$pkg_db['pkg_id']] = $pkg_db['manager'] ."-".$pkg_db['name']."-".$pkg_db['arch']."-".$pkg_db['version']."-".$pkg_db['build'];
+    }
+
+    foreach(explode("\n", $agent_data['rpm']) as $package) 
+    {
+	list($name, $version, $build, $arch, $size) = explode(" ", $package);
+        $pkgs[$manager][$name][$arch][$version][$build]['manager'] = $manager;
+        $pkgs[$manager][$name][$arch][$version][$build]['name']    = $name;
+        $pkgs[$manager][$name][$arch][$version][$build]['arch']    = $arch;
+        $pkgs[$manager][$name][$arch][$version][$build]['version'] = $version;
+        $pkgs[$manager][$name][$arch][$version][$build]['build']   = $build;
+        $pkgs[$manager][$name][$arch][$version][$build]['size']    = $size;
+        $pkgs[$manager][$name][$arch][$version][$build]['status']  = '1';
+        $text = $manager."-".$name."-".$arch."-".$version."-".$build;
+        $pkgs_id[] = $pkgs[$manager][$name][$arch][$version][$build];
+    }
+
+    foreach($pkgs_id as $pkg) {
+      $name    = $pkg['name'];
+      $version = $pkg['version'];
+      $build   = $pkg['build'];
+      $arch    = $pkg['arch'];
+      $size    = $pkg['size'];
+      
+      #echo(str_pad($name, 20)." ".str_pad($version, 10)." ".str_pad($build, 10)." ".$arch."\n");
+      #echo($name." ");
+
+      if(is_array($pkgs_db[$pkg['manager']][$pkg['name']][$pkg['arch']][$pkg['version']][$pkg['build']]))
+      {
+        ### FIXME - packages_history table
+        $id = $pkgs_db[$pkg['manager']][$pkg['name']][$pkg['arch']][$pkg['version']][$pkg['build']]['id'];
+        if($pkgs_db[$pkg['manager']][$pkg['name']][$pkg['arch']][$pkg['version']][$pkg['build']]['status'] != '1')
+        {
+          $pkg_update['status']  = '1';
+        }
+        if($pkgs_db[$pkg['manager']][$pkg['name']][$pkg['arch']][$pkg['version']][$pkg['build']]['size'] != $size)
+        {
+          $pkg_update['size']  = $size; 
+        }
+        if(!empty($pkg_update))
+        {
+          dbUpdate($pkg_update, 'packages', '`pkg_id` = ?', array($id));
+          echo("u");
+        } else {
+          echo(".");
+        }
+        unset($pkgs_db_id[$id]);
+      } else {    
+        if(count($pkgs[$manager][$name][$arch], 1) > "10" || count($pkgs_db[$manager][$name][$arch], 1) == '0') {
+          dbInsert(array('device_id' => $device['device_id'], 'name' => $name, 'manager' => $manager,
+                       'status' => 1, 'version' => $version, 'build' => $build, 'arch' => $arch, 'size' => $size), 'packages');
+          echo("+".$name."-".$version."-".$build."-".$arch);
+        } elseif(count($pkgs_db[$manager][$name][$arch], 1)) {
+          $pkg_c = dbFetchRow("SELECT * FROM `packages` WHERE `device_id` = ? AND `manager` = ? AND `name` = ? and `arch` = ? ORDER BY version DESC, build DESC", 
+                                    array($device['device_id'], $manager, $name, $arch));
+	  echo("U(".$pkg_c['name']."-".$pkg_c['version']."-".$pkg_c['build']."|".$name."-".$version."-".$build.")");
+          $pkg_update = array('version' => $version, 'build' => $build, 'status' => '1', 'size' => $size);
+	  dbUpdate($pkg_update, 'packages', '`pkg_id` = ?', array($pkg_c['pkg_id']));
+          unset($pkgs_db_id[$pkg_c['pkg_id']]);
+        }
+      }
+       unset($pkg_update);
+    }
+  }
+
+  foreach($pkgs_db_id as $id => $text) 
+  {
+    dbDelete('packages', "`pkg_id` =  ?", array($id));
+    echo("-".$text);
+  }
+
+}
+
+echo("\n");
+
+}
+
+?>