diff --git a/doc/ver.xml b/doc/ver.xml
index be462bb..d84260b 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -5,6 +5,10 @@
 
 <dt>Version 4.7 Under development </dt><dd>
 <ul>
+<li> Correct the build file for generating the UmlGraph
+javadocs under Unix (Dirk Datzert)</li>
+<li> Correct output of UmlGraphDoc path-relative file names under Windows
+(fix by: Panagiotis Astithas)</li>
 </ul>
 </dd>
 
diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
index 97bb600..de492ad 100644
--- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
+++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java
@@ -984,7 +984,7 @@ class ClassGraph {
 	if (opt.outputDirectory != null)
 	    file = new File(opt.outputDirectory, opt.outputFileName);
 	else
-	    file = new File(".", opt.outputFileName);
+	    file = new File(opt.outputFileName);
 	// make sure the output directory are there, otherwise create them
 	if(!file.getParentFile().exists())
 	    file.getParentFile().mkdirs();
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java
index 97bb600..de492ad 100644
--- a/src/org/umlgraph/doclet/ClassGraph.java
+++ b/src/org/umlgraph/doclet/ClassGraph.java
@@ -984,7 +984,7 @@ class ClassGraph {
 	if (opt.outputDirectory != null)
 	    file = new File(opt.outputDirectory, opt.outputFileName);
 	else
-	    file = new File(".", opt.outputFileName);
+	    file = new File(opt.outputFileName);
 	// make sure the output directory are there, otherwise create them
 	if(!file.getParentFile().exists())
 	    file.getParentFile().mkdirs();