diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/DocumentEdit.js
index 139689ef..653133a0 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/DocumentEdit.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/DocumentEdit.js
@@ -7,6 +7,9 @@ angular.module('docs').controller('DocumentEdit', function($rootScope, $scope, $
   // Alerts
   $scope.alerts = [];
 
+  // Vocabularies
+  $scope.vocabularies = [];
+
   // Orphan files to add
   $scope.orphanFiles = $stateParams.files ? $stateParams.files.split(',') : [];
 
@@ -219,4 +222,14 @@ angular.module('docs').controller('DocumentEdit', function($rootScope, $scope, $
   } else {
     $scope.resetForm();
   }
+
+  // Load vocabularies
+  $scope.loadVocabulary = function(name) {
+    Restangular.one('vocabulary', name).get().then(function(result) {
+      $scope.vocabularies[name] = result.entries;
+    });
+  };
+  $scope.loadVocabulary('type');
+  $scope.loadVocabulary('coverage');
+  $scope.loadVocabulary('rights');
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.edit.html b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
index f25c1be5..5a147655 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.edit.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
@@ -93,6 +93,31 @@
                  placeholder="A related resource from which the described resource is derived" name="source" ng-model="document.source" ng-disabled="fileIsUploading" />
         </div>
       </div>
+
+      <div class="form-group">
+        <label class="col-sm-2 control-label" for="inputType">Type</label>
+        <div class="col-sm-10">
+          <select class="form-control" id="inputType" name="type" ng-model="document.type" ng-disabled="fileIsUploading">
+            <option ng-repeat="vocabulary in vocabularies['type']">{{ vocabulary.value }}</option>
+          </select>
+        </div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-2 control-label" for="inputCoverage">Coverage</label>
+        <div class="col-sm-10">
+          <select class="form-control" id="inputCoverage" name="coverage" ng-model="document.coverage" ng-disabled="fileIsUploading">
+            <option ng-repeat="vocabulary in vocabularies['coverage']">{{ vocabulary.value }}</option>
+          </select>
+        </div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-2 control-label" for="inputRights">Rights</label>
+        <div class="col-sm-10">
+          <select class="form-control" id="inputRights" name="rights" ng-model="document.rights" ng-disabled="fileIsUploading">
+            <option ng-repeat="vocabulary in vocabularies['rights']">{{ vocabulary.value }}</option>
+          </select>
+        </div>
+      </div>
     </fieldset>
 
     <div class="form-group">
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
index 41b78fb7..0e3e7d2b 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
@@ -10,6 +10,12 @@
   <dd ng-if="document.format">{{ document.format }}</dd>
   <dt ng-if="document.source">Source</dt>
   <dd ng-if="document.source">{{ document.source }}</dd>
+  <dt ng-if="document.type">Type</dt>
+  <dd ng-if="document.type">{{ document.type }}</dd>
+  <dt ng-if="document.coverage">Coverage</dt>
+  <dd ng-if="document.coverage">{{ document.coverage }}</dd>
+  <dt ng-if="document.rights">rights</dt>
+  <dd ng-if="document.rights">{{ document.rights }}</dd>
 </dl>
 
 <div ng-file-drop drag-over-class="bg-success" ng-multiple="true" allow-dir="false" ng-model="dropFiles"