diff --git a/doc/config.html b/doc/config.html
index b38ab02f..9a1ce0b5 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -749,6 +749,16 @@ of attachments can be restricted. The server will then refuse to accept larger
 attachments. The default is 10485760 (= 10 MB). This option has to be placed
 into the [global] section and the elogd server has to be restarted after a change.<p>
 
+<li><b><code>Fonts = &lt;list&gt;</code></b>
+<br>
+List of fonts (comma separated) to be shown in the font drop-down box of the entry edit 
+form. Default is<br>
+<br><code>Fonts = Arial, Comic Sans MS, Courier New, Tahoma, Times New Roman, Verdana</code>
+<br><br>
+On Unix systems some of these fonts might not be installed, in which case they can
+be replaced by others like <b>Serif</b>, <b>Sans-serif</b>, <b>Helvetica</b>.
+<p>
+
 </UL>
 
 <a name="attrib"><hr>
diff --git a/src/elogd.c b/src/elogd.c
index c42ea226..e2921184 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -9128,12 +9128,14 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
       rsprintf("onchange=\"elcode(document.form1.Text,'FONT',this.options[this.selectedIndex].value);");
       rsprintf("this.selectedIndex=0;\">\n");
       rsprintf("<option value=\"0\">%s</option>\n", loc("FONT"));
-      rsprintf("<option value=\"arial\">Arial</option>\n");
-      rsprintf("<option value=\"comic sans ms\">Comic Sans MS</option>\n");
-      rsprintf("<option value=\"courier\">Courier New</option>\n");
-      rsprintf("<option value=\"tahoma\">Tahoma</option>\n");
-      rsprintf("<option value=\"times new roman\">Times New Roman</option>\n");
-      rsprintf("<option value=\"verdana\">Verdana</option>\n");
+
+      if (!getcfg(lbs->name, "Fonts", str, sizeof(str)))
+         strcpy(str, "Arial, Comic Sans MS, Courier New, Tahoma, Times New Roman, Verdana");
+
+      n = strbreak(str, list, MAX_N_ATTR, ",");
+      for (i=0 ; i<n ; i++)
+         rsprintf("<option value=\"%s\">%s</option>\n", list[i], list[i]);
+
       rsprintf("</select>\n");
 
       rsprintf(" <select name=\"size\" ");