diff --git a/tabellio/config/controlpanel.pt b/tabellio/config/controlpanel.pt
index 2a24141..ed09763 100644
--- a/tabellio/config/controlpanel.pt
+++ b/tabellio/config/controlpanel.pt
@@ -234,6 +234,135 @@
 
         </dd>
 
+
+        <dt id="fieldsetlegend-greffier">Greffier settings</dt>
+        <dd id="fieldset-greffier">
+
+            <form
+                name="greffier"
+                method="post"
+                class="enableUnloadProtection"
+                tal:attributes="action request/URL"
+                tal:define="errors view/errors">
+
+                <div
+                    tal:define="error errors/greffier_name | nothing;
+                                greffier_name python:request.get('greffier_name', view.settings.greffier_name)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="greffier_name" i18n:translate="label_greffier_name">Greffier Name</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="greffier_name"
+                        id="greffier_name"
+                        type="text"
+                        size="80"
+                        tal:attributes="value greffier_name"
+                        />
+                </div>
+
+                <div
+                    tal:define="error errors/greffier_email | nothing;
+                                greffier_email python:request.get('greffier_email', view.settings.greffier_email)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="greffier_email" i18n:translate="label_greffier_email">Greffier Email</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="greffier_email"
+                        id="greffier_email"
+                        type="text"
+                        size="80"
+                        tal:attributes="value greffier_email"
+                        />
+                </div>
+
+                <div
+                    tal:define="error errors/greffier_address_line1 | nothing;
+                                greffier_address_line1 python:request.get('greffier_address_line1', view.settings.greffier_address_line1)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="greffier_address_line1" i18n:translate="label_greffier_address_line1">Greffier Address Line 1</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="greffier_address_line1"
+                        id="greffier_address_line1"
+                        type="text"
+                        size="80"
+                        tal:attributes="value greffier_address_line1"
+                        />
+                </div>
+
+                <div
+                    tal:define="error errors/greffier_address_line2 | nothing;
+                                greffier_address_line2 python:request.get('greffier_address_line2', view.settings.greffier_address_line2)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="greffier_address_line2" i18n:translate="label_greffier_address_line2">Greffier Address Line 2</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="greffier_address_line2"
+                        id="greffier_address_line2"
+                        type="text"
+                        size="80"
+                        tal:attributes="value greffier_address_line2"
+                        />
+                </div>
+
+                <div
+                    tal:define="error errors/greffier_phone | nothing;
+                                greffier_phone python:request.get('greffier_phone', view.settings.greffier_phone)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="greffier_phone" i18n:translate="label_greffier_phone">Greffier Phone</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="greffier_phone"
+                        id="greffier_phone"
+                        type="text"
+                        size="80"
+                        tal:attributes="value greffier_phone"
+                        />
+                </div>
+
+                <div
+                    tal:define="error errors/greffier_fax | nothing;
+                                greffier_fax python:request.get('greffier_fax', view.settings.greffier_fax)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="greffier_fax" i18n:translate="label_greffier_fax">Greffier Fax</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="greffier_fax"
+                        id="greffier_fax"
+                        type="text"
+                        size="80"
+                        tal:attributes="value greffier_fax"
+                        />
+                </div>
+
+                <div class="formControls">
+                    <input
+                        type="submit"
+                        name="form.button.GreffierSave"
+                        class="context"
+                        value="Save"
+                        i18n:attributes="value" />
+
+                    <input
+                        type="submit"
+                        name="form.button.Cancel"
+                        class="context"
+                        value="Cancel"
+                        i18n:attributes="value" />
+                </div>
+
+                <input tal:replace="structure context/@@authenticator/authenticator" />
+
+            </form>
+
+        </dd>
+
     </dl>
 
 </div>
diff --git a/tabellio/config/controlpanel.py b/tabellio/config/controlpanel.py
index 4a42aab..583e30f 100644
--- a/tabellio/config/controlpanel.py
+++ b/tabellio/config/controlpanel.py
@@ -67,6 +67,16 @@ class TabellioControlpanel(BrowserView):
             submitted = True
             self.settings.sessions = form.get('sessions')
 
+        if 'form.button.GreffierSave' in form:
+            self.authorize()
+            submitted = True
+            self.settings.greffier_name = form.get('greffier_name')
+            self.settings.greffier_email = form.get('greffier_email')
+            self.settings.greffier_address_line1 = form.get('greffier_address_line1')
+            self.settings.greffier_address_line2 = form.get('greffier_address_line2')
+            self.settings.greffier_phone = form.get('greffier_phone')
+            self.settings.greffier_fax = form.get('greffier_fax')
+
         if submitted and not self.errors:
             self._setup()
             IStatusMessage(self.request).add(_(u"Changes saved"))
diff --git a/tabellio/config/interfaces.py b/tabellio/config/interfaces.py
index df4d865..f177bdf 100644
--- a/tabellio/config/interfaces.py
+++ b/tabellio/config/interfaces.py
@@ -43,3 +43,9 @@ class ITabellioSettings(Interface):
         title=_('sessions', 'Sessions'),
         required=False)
 
+    greffier_name = schema.Text(title=_(u'Greffier Name'), required=False)
+    greffier_email = schema.Text(title=_(u'Greffier Email'), required=False)
+    greffier_address_line1 = schema.Text(title=_(u'Greffier Address Line 1'), required=False)
+    greffier_address_line2 = schema.Text(title=_(u'Greffier Address Line 2'), required=False)
+    greffier_phone = schema.Text(title=_(u'Greffier Phone'), required=False)
+    greffier_fax = schema.Text(title=_(u'Greffier Fax'), required=False)