diff --git a/LetoDMS_Core/Core.php b/LetoDMS_Core/Core.php
index 35b52f64a..2eddeec2b 100644
--- a/LetoDMS_Core/Core.php
+++ b/LetoDMS_Core/Core.php
@@ -51,6 +51,11 @@ require_once('Core/inc.ClassUser.php');
  */
 require_once('Core/inc.ClassKeywords.php');
 
+/**
+ * @uses LetoDMS_DocumentCategory
+ */
+require_once('Core/inc.ClassDocumentCategory.php');
+
 /**
  * @uses LetoDMS_Notification
  */
diff --git a/LetoDMS_Core/Core/inc.ClassDocumentCategory.php b/LetoDMS_Core/Core/inc.ClassDocumentCategory.php
new file mode 100644
index 000000000..3c45fa8d5
--- /dev/null
+++ b/LetoDMS_Core/Core/inc.ClassDocumentCategory.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Implementation of document categories in the document management system
+ *
+ * @category   DMS
+ * @package    LetoDMS_Core
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class to represent a document category in the document management system
+ *
+ * @category   DMS
+ * @package    LetoDMS_Core
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C)2011 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class LetoDMS_Core_DocumentCategory {
+	/**
+	 * @var integer $_id id of document category
+	 * @access protected
+	 */
+	var $_id;
+
+	/**
+	 * @var string $_name name of category
+	 * @access protected
+	 */
+	var $_name;
+
+	/**
+	 * @var object $_dms reference to dms this category belongs to
+	 * @access protected
+	 */
+	var $_dms;
+
+	function LetoDMS_Core_DocumentCategory($id, $name) {
+		$this->_id = $id;
+		$this->_name = $name;
+		$this->_dms = null;
+	}
+
+	function setDMS($dms) {
+		$this->_dms = $dms;
+	}
+
+	function getID() { return $this->_id; }
+
+	function getName() { return $this->_name; }
+
+	function setName($newName) {
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblCategory SET name = '$newName' WHERE id = ". $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_name = $newName;
+		return true;
+	}
+
+	function isUsed() {
+		$db = $this->_dms->getDB();
+		
+		$queryStr = "SELECT * FROM tblDocumentCategory WHERE categoryID=".$this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_array($resArr) && count($resArr) == 0)
+			return false;
+		return true;
+	}
+
+	function getCategories() {
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT * FROM tblCategory";
+		return $db->getResultArray($queryStr);
+	}
+
+	function addCategory($keywords) {
+		$db = $this->_dms->getDB();
+
+		$queryStr = "INSERT INTO tblCategory (category) VALUES ('".$keywords."')";
+		return $db->getResult($queryStr);
+	}
+
+	function remove() {
+		$db = $this->_dms->getDB();
+
+		$queryStr = "DELETE FROM tblCategory WHERE id = " . $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		return true;
+	}
+
+	function getDocumentsByCategory() {
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT * FROM tblDocumentCategory where categoryID=".$this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		$documents = array();
+		foreach ($resArr as $row) {
+			array_push($documents, $this->_dms->getDocument($row["id"]));
+		}
+		return $documents;
+	}
+
+}
+
+?>
diff --git a/LetoDMS_Core/package.xml b/LetoDMS_Core/package.xml
index 99b8b7131..cda32201d 100644
--- a/LetoDMS_Core/package.xml
+++ b/LetoDMS_Core/package.xml
@@ -68,6 +68,9 @@
     <file name="inc.ClassNotification.php" role="php">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
+    <file name="inc.ClassDocumentCategory.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
    </dir> <!-- /DTD -->
    <dir name="tests">
     <file name="getfoldertree.php" role="test" />