diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index 251203a..aa0a072 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -19,9 +19,9 @@ include_once("aur.inc");
 class AurJSON {
     private $dbh = false;
     private $exposed_methods = array('search','info','msearch');
-    private $fields = array('Packages.ID','Name','Version','CategoryID',
-	'Description', 'LocationID', 'URL','URLPath','License','NumVotes',
-	'OutOfDate');
+    private $fields = array('Packages.ID as ID','Name','Version',
+        'PackageCategories.Category as Category', 'Description', 'URL',
+        'URLPath', 'License','NumVotes', 'OutOfDate');
 
     /**
      * Handles post data, and routes the request.
@@ -96,7 +96,9 @@ class AurJSON {
         $keyword_string = mysql_real_escape_string($keyword_string, $this->dbh);
 
         $query = "SELECT " . implode(',', $this->fields) .
-            " FROM Packages WHERE DummyPkg=0 AND " .
+            " FROM Packages, PackageCategories WHERE " .
+            " PackageCategories.ID = Packages.CategoryID AND " .
+            " DummyPkg=0 AND " .
             "  ( Name LIKE '%{$keyword_string}%' OR " .
             "    Description LIKE '%{$keyword_string}%' )";
         $result = db_query($query, $this->dbh);
@@ -122,7 +124,8 @@ class AurJSON {
      **/
     private function info($pqdata) {
         $base_query = "SELECT " . implode(',', $this->fields) .
-            " FROM Packages WHERE DummyPkg=0 AND ";
+            " FROM Packages, PackageCategories WHERE " .
+            " PackageCategories.ID = Packages.CategoryID AND DummyPkg=0 AND ";
 
         if ( is_numeric($pqdata) ) {
             // just using sprintf to coerce the pqd to an int
@@ -169,8 +172,9 @@ class AurJSON {
         $fields = implode(',', $this->fields);
 
         $query = "SELECT Users.Username as Maintainer, {$fields} " .
-            " FROM Packages, Users " .
+            " FROM Packages, Users, PackageCategories " .
             "        WHERE Packages.MaintainerUID = Users.ID AND " .
+            "              PackageCategories.ID = Packages.CategoryID AND " .
             "              Users.Username = '{$maintainer}'";
         $result = db_query($query, $this->dbh);
 
