diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderDocumentTypes.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderDocumentTypes.php
new file mode 100644
index 0000000..65acf25
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderDocumentTypes.php
@@ -0,0 +1,72 @@
+<?php
+
+require_once('../../../../config/dmsDefaults.php');
+require_once(KT_LIB_DIR . '/dispatcher.inc.php');
+require_once(KT_LIB_DIR . '/documentmanagement/DocumentType.inc');
+require_once(KT_LIB_DIR . '/foldermanagement/FolderDocTypeLink.inc');
+
+$sectionName = "Administration";
+require_once(KT_DIR . "/presentation/webpageTemplate.inc");
+
+class KTFolderDocumentTypeDispatcher extends KTStandardDispatcher {
+    function check () {
+        if (empty($_REQUEST['fFolderId'])) {
+            $this->permissionDenied();
+            exit(0);
+        }
+        $oPermission = KTPermission::getByName('ktcore.permissions.write');
+        $this->oFolder =& Folder::get($_REQUEST['fFolderId']);
+        $oUser =& User::get($_SESSION['userID']);
+        if (!KTPermissionUtil::userHasPermissionOnItem($oUser, $oPermission, $this->oFolder)) {
+            $this->permissionDenied();
+            exit(0);
+        }
+        return true;
+    }
+
+    function do_main() {
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate('ktcore/documenttypes/folderassign');
+
+        $sTable = KTUtil::getTableName('folder_doctypes');
+        $aQuery = array(
+            "SELECT document_type_id FROM $sTable WHERE folder_id = ?",
+            array($this->oFolder->getId()),
+        );
+        $aSelectedIds = DBUtil::getResultArrayKey($aQuery, 'document_type_id');
+
+        $oTemplate->setData(array(
+            'oFolder' => $this->oFolder,
+            'document_types' => DocumentType::getList(),
+            'selected_types' => $aSelectedIds,
+        ));
+        return $oTemplate;
+    }
+
+    function do_assign() {
+        if (empty($_REQUEST['restricted'])) {
+            $this->oFolder->setRestrictDocumentTypes(false);
+        } else {
+            $this->oFolder->setRestrictDocumentTypes(true);
+        }
+
+        $sTable = KTUtil::getTableName('folder_doctypes');
+        $res = DBUtil::runQuery(array(
+            "DELETE FROM $sTable WHERE folder_id = ?",
+            array($this->oFolder->getId()),
+        ));
+        foreach ($_REQUEST['document_types'] as $iDocumentTypeId) {
+            $oLink = new FolderDocTypeLink($this->oFolder->getId(), $iDocumentTypeId);
+            $oLink->create();
+        }
+        $this->oFolder->update();
+        $this->errorRedirectToMain('Changes made', 'fFolderId=' .
+                $this->oFolder->getId());
+        exit(0);
+    }
+}
+
+$d =& new KTFolderDocumentTypeDispatcher;
+$d->dispatch();
+
+?>
diff --git a/templates/ktcore/documenttypes/folderassign.smarty b/templates/ktcore/documenttypes/folderassign.smarty
new file mode 100644
index 0000000..0e99831
--- /dev/null
+++ b/templates/ktcore/documenttypes/folderassign.smarty
@@ -0,0 +1,20 @@
+<h1>Document types</h1>
+
+<p>Select document types allowed in folder:</p>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="action" value="assign">
+<input type="hidden" name="fFolderId" value="{$oFolder->getId()}">
+<table class="prettysw" cellspacing="0" cellpadding="0">
+<tr><th>Folder</th><td>{$oFolder->getName()}</td></tr>
+<tr><th>Restrict document types</th><td>{boolean_checkbox name="restricted" bool=$oFolder->getRestrictDocumentTypes() }</td></tr>
+<tr><th>Document Types</th><td>
+{entity_select entities=$document_types selected=$selected_types name="document_types[]" multiple="yes"}
+</td></tr>
+</table>
+
+<input type="submit" name="submit" value="Assign">
+</form>
+
+{assign var="iFolderId" value=$oFolder->getId()}
+<a href="{"editFolder"|generateControllerUrl:"fFolderID=$iFolderId"}">Back to folder</a>