diff --git a/html/pages/eventlog.inc.php b/html/pages/eventlog.inc.php
index f4b6a92de..6c27830e8 100644
--- a/html/pages/eventlog.inc.php
+++ b/html/pages/eventlog.inc.php
@@ -1,13 +1,76 @@
 <?php
 
-if ($_GET['opta'] == "expunge" && $_SESSION['userlevel'] >= '10') { mysql_query("TRUNCATE TABLE `eventlog`"); }
+$param = array();
+
+if ($vars['action'] == "expunge" && $_SESSION['userlevel'] >= '10')
+{
+  mysql_query("TRUNCATE TABLE `eventlog`");
+  print_message("Event log truncated");
+}
+
+$numresults = 250;
+
+print_optionbar_start();
+
+if (is_numeric($vars['page']))
+{
+  $start = $vars['page'] * $numresults;
+} else
+{
+  $start = 0;
+}
+
+$where = "1";
+
+if (is_numeric($_POST['device']))
+{
+  $where .= ' AND E.host = ?';
+  $param[] = $_POST['device'];
+}
+
+if ($_POST['string'])
+{
+  $where .= " AND E.message LIKE ?";
+  $param[] = "%".$_POST['string']."%";
+}
+    
+?>
+
+<form method="post" action="">
+  <span style="font-weight: bold;">Event log</span> &#187;
+  <label><strong>Search</strong>
+    <input type="text" name="string" id="string" value="<?php echo($_POST['string']); ?>" />
+  </label>
+  <label>
+  <label>
+    <strong>Device</strong>
+    <select name="device" id="device">
+      <option value="">All Devices</option>
+      <?php
+        foreach (get_all_devices() as $hostname)
+        {
+          echo("<option value='".getidbyname($hostname)."'");
+
+          if (getidbyname($hostname) == $_POST['device']) { echo("selected"); }
+
+          echo(">".$hostname."</option>");
+        }
+      ?>
+    </select>
+  </label>
+  <input type=submit class=submit value=Search>
+</form>
+
+<?php
+
+print_optionbar_end();
 
 if ($_SESSION['userlevel'] >= '5')
 {
-  $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate  FROM `eventlog` ORDER BY `datetime` DESC LIMIT 0,250";
+  $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate  FROM `eventlog` AS E WHERE $where ORDER BY `datetime` DESC LIMIT $start,$numresults";
 } else {
-  $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate  FROM `eventlog` AS E, devices_perms AS P WHERE E.host = P.device_id AND P.user_id = ? ORDER BY `datetime` DESC LIMIT 0,250";
-  $param = array($_SESSION['user_id']);
+  $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate  FROM `eventlog` AS E, devices_perms AS P WHERE $where AND E.host = P.device_id AND P.user_id = ? ORDER BY `datetime` DESC LIMIT $start,$numresults";
+  $param[] = $_SESSION['user_id'];
 }
 
 echo('<table cellspacing="0" cellpadding="1" width="100%">');