diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
index c14e386..894bafa 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
index c14e386..894bafa 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java
index c14e386..894bafa 100644
--- a/src/gr/spinellis/umlgraph/doclet/Options.java
+++ b/src/gr/spinellis/umlgraph/doclet/Options.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
index c14e386..894bafa 100644
--- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java
+++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
index c14e386..894bafa 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index c14e386..894bafa 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java
index c14e386..894bafa 100644
--- a/src/org/umlgraph/doclet/ClassInfo.java
+++ b/src/org/umlgraph/doclet/ClassInfo.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java
index c14e386..894bafa 100644
--- a/src/org/umlgraph/doclet/Options.java
+++ b/src/org/umlgraph/doclet/Options.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java
index c14e386..894bafa 100644
--- a/src/org/umlgraph/doclet/StringUtil.java
+++ b/src/org/umlgraph/doclet/StringUtil.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java
index c14e386..894bafa 100644
--- a/src/org/umlgraph/doclet/UmlGraph.java
+++ b/src/org/umlgraph/doclet/UmlGraph.java
@@ -617,9 +617,11 @@ public class UmlGraph {
 			"# Generated by $Id$\n" +
 			"#\n\n" +
 			"digraph G {\n" +
-			"\tedge [fontname=\"Helvetica\",fontsize=10,labelfontname=\"Helvetica\",labelfontsize=10];\n" +
-
-			"\tnode [fontname=\"Helvetica\",fontsize=10,shape=record];"
+			"\tedge [fontname=\"" + opt.edgeFontName +
+			"\",fontsize=10,labelfontname=\"" + opt.edgeFontName +
+			"\",labelfontsize=10];\n" +
+			"\tnode [fontname=\"" + opt.nodeFontName +
+			"\",fontsize=10,shape=record];"
 		);
 		if (opt.horizontal)
 			opt.w.println("\trankdir=LR;\n\tranksep=1;");