diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
new file mode 100644
index 0000000..84e9c9b
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
@@ -0,0 +1,84 @@
+<?php
+
+require_once('../../../../../config/dmsDefaults.php');
+require_once(KT_LIB_DIR . '/dispatcher.inc.php');
+require_once(KT_LIB_DIR . '/templating/templating.inc.php');
+
+require_once(KT_LIB_DIR . '/documentmanagement/DocumentField.inc');
+require_once(KT_LIB_DIR . '/metadata/fieldset.inc.php');
+require_once(KT_LIB_DIR . '/metadata/metadatautil.inc.php');
+
+$sectionName = "Administration";
+require_once(KT_DIR . "/presentation/webpageTemplate.inc");
+
+class KTDocumentFieldDispatcher extends KTStandardDispatcher {
+    function do_main () {
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate('ktcore/fields/list');
+        $oTemplate->setData(array(
+            'fieldsets' => KTFieldset::getList(),
+        ));
+        return $oTemplate;
+    }
+
+    function do_edit() {
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate('ktcore/fields/edit');
+        $oFieldset =& KTFieldset::get($_REQUEST['fFieldsetId']);
+        $oTemplate->setData(array(
+            'oFieldset' => $oFieldset,
+        ));
+        return $oTemplate;
+    }
+
+    function do_editobject() {
+        $oFieldset =& KTFieldset::get($_REQUEST['fFieldsetId']);
+        $oFieldset->setName($_REQUEST['name']);
+        $oFieldset->setNamespace($_REQUEST['namespace']);
+        $res = $oFieldset->update();
+        if (PEAR::isError($res) || ($res === false)) {
+            $this->errorRedirectTo('edit', 'Could not save fieldset changes', 'fFieldsetId=' . $oFieldset->getId());
+            exit(0);
+        }
+        $this->errorRedirectTo('edit', 'Changes saved', 'fFieldsetId=' . $oFieldset->getId());
+        exit(0);
+    }
+
+    function do_newfield() {
+        $is_lookup = false;
+        $is_tree = false;
+        if ($_REQUEST['type'] === "lookup") {
+            $is_lookup = true;
+        }
+        if ($_REQUEST['type'] === "tree") {
+            $is_lookup = true;
+            $is_tree = true;
+        }
+        $oFieldset = KTFieldset::get($_REQUEST['fFieldsetId']);
+        $oField =& DocumentField::createFromArray(array(
+            'name' => $_REQUEST['name'],
+            'datatype' => 'STRING',
+            'haslookup' => $is_lookup,
+            'haslookuptree' => $is_tree,
+            'parentfieldset' => $oFieldset->getId(),
+        ));
+        if (PEAR::isError($res) || ($res === false)) {
+            $this->errorRedirectTo('edit', 'Could not create field', 'fFieldsetId=' . $oFieldset->getId());
+            exit(0);
+        }
+        $this->errorRedirectTo('edit', 'Field created', 'fFieldsetId=' . $oFieldset->getId());
+        exit(0);
+    }
+
+    function handleOutput($data) {
+        global $main;
+        $main->bFormDisabled = true;
+        $main->setCentralPayload($data);
+        $main->render();
+    }
+}
+
+$d =& new KTDocumentFieldDispatcher;
+$d->dispatch();
+
+?>
diff --git a/templates/ktcore/fields/edit.smarty b/templates/ktcore/fields/edit.smarty
new file mode 100644
index 0000000..6aada46
--- /dev/null
+++ b/templates/ktcore/fields/edit.smarty
@@ -0,0 +1,59 @@
+<h1>Fieldset: {$oFieldset->getName()|escape}</h1>
+
+<h2>Fieldset properties</h2>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="editobject">
+<table class="prettysw" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <td><input type="textbox" name="name" value="{$oFieldset->getName()|escape}"></td>
+  </tr>
+  <tr>
+    <th>Namespace</th>
+    <td><input type="textbox" name="namespace" value="{$oFieldset->getNamespace()|escape}"></td>
+  </tr>
+</table>
+<input type="submit" name="submit" value="Change">
+</form>
+
+<h2>Fieldset members</h2>
+
+{if $oFieldset->getFields() }
+<h3>Existing members</h3>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<ul>
+{foreach from=$oFieldset->getFields() item=oField}
+  <li><label><input type="checkbox"
+name="fieldsetids[]"
+value="{$oField->getId()}">{$oField->getName()|escape}</label></li>
+{/foreach}
+</ul>
+<input type="submit" name="submit" value="Remove fields">
+</form>
+{/if}
+
+<h3>Add a new field</h3>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="newfield">
+<table class="prettysw" cellpadding="0" cellspacing="0">
+  <tr>
+    <th>Name</th>
+    <td><input type="textbox" name="name" />
+  </tr>
+  <tr>
+    <th>Type</th>
+    <td>
+<select name="type">
+<option value="normal">Normal</option>
+<option value="lookup">Lookup</option>
+<option value="tree">Tree</option>
+</select>
+    </td>
+  </tr>
+</table>
+<input type="submit" name="submit" value="Add field">
+</form>
diff --git a/templates/ktcore/fields/list.smarty b/templates/ktcore/fields/list.smarty
new file mode 100644
index 0000000..247cbd1
--- /dev/null
+++ b/templates/ktcore/fields/list.smarty
@@ -0,0 +1,47 @@
+<h1>Document Fields</h1>
+
+{ if $fieldsets}
+<h2>Existing generic document fields</h2>
+
+<table class="pretty" cellspacing="0" cellpadding="0">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Generic</th>
+      <th>Fields</th>
+    </tr>
+  </thead>
+  <tbody>
+{foreach from=$fieldsets item=oFieldset}
+    <tr>
+      <td>
+        <a href="?action=edit&fFieldsetId={$oFieldset->getId()}"> { $oFieldset->getName() }
+        </a>
+      </td>
+      <td>
+{if $oFieldset->getIsGeneric()}
+	Yes
+{else}
+	No
+{/if}
+      </td>
+      <td>
+<ul>
+{foreach from=$oFieldset->getFields() item=oField}
+  <li>{$oField->getName()}</li>
+{/foreach}
+</ul>
+      </td>
+    </tr>
+  </tbody>
+{/foreach}
+</table>
+{/if}
+
+<h2>Create a new document field set</h2>
+
+<form method="POST">
+<input type="hidden" name="action" value="new">
+<input type="textbox" name="name">
+<input type="submit" name="submit" value="Create">
+</form>