diff --git a/Makefile b/Makefile
index e1e5eb1..1214987 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 .SUFFIXES:.class .java
-VERSION=2.6
+VERSION=2.7
 TARBALL=UMLGraph-$(VERSION).tar.gz
 ZIPBALL=UMLGraph-$(VERSION).zip
 DISTDIR=UMLGraph-$(VERSION)
diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
index 8f7b359..043a34f 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
index 8f7b359..043a34f 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java
index 8f7b359..043a34f 100644
--- a/src/gr/spinellis/umlgraph/doclet/Options.java
+++ b/src/gr/spinellis/umlgraph/doclet/Options.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
index 8f7b359..043a34f 100644
--- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java
+++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
index 8f7b359..043a34f 100644
--- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index 8f7b359..043a34f 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java
index 8f7b359..043a34f 100644
--- a/src/org/umlgraph/doclet/ClassInfo.java
+++ b/src/org/umlgraph/doclet/ClassInfo.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java
index 8f7b359..043a34f 100644
--- a/src/org/umlgraph/doclet/Options.java
+++ b/src/org/umlgraph/doclet/Options.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java
index 8f7b359..043a34f 100644
--- a/src/org/umlgraph/doclet/StringUtil.java
+++ b/src/org/umlgraph/doclet/StringUtil.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java
index 8f7b359..043a34f 100644
--- a/src/org/umlgraph/doclet/UmlGraph.java
+++ b/src/org/umlgraph/doclet/UmlGraph.java
@@ -151,8 +151,8 @@ class Options implements Cloneable {
 		} else if(opt[0].equals("-apidocmap")) {
 			apiDocMapFileName = opt[1];
 		} else if(opt[0].equals("-noguillemot")) {
-			guilOpen = '<';
-			guilClose = '>';
+			guilOpen = '(';
+			guilClose = ')';
 		} else
 			; // Do nothing, javadoc will handle the option or complain, if needed.
 	}