diff --git a/ChangeLog b/ChangeLog
index 474a24420..f8e4972b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-23  Johan Gonqvist <johan.gronqvist@gmail.com>
+	* src/plugins/NarrativeWeb.py:
+	NarrativeWeb links incorrect in windows. (#0001117)
+
 2007-07-23  Brian Matherly <brian@gramps-project.org>
 	* src/plugins/IndivComplete.py:
 	* src/plugins/Summary.py:
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index 156c7d2ed..ac72483f3 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2000-2007  Donald N. Allingham
+# Copyright (C) 2007       Johan Gonqvist <johan.gronqvist@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Pubilc License as published by
@@ -217,11 +218,11 @@ class BasePage:
         return of
 
     def link_path(self,name,path):
-        base = self.build_name("",name)
-        path = "%s/%s/%s/%s" % (path,name[0],name[1],base)
-        if os.sys.platform == "win32":
-            path = path.lower()
-        return path
+         path = "%s/%s/%s" % (path,name[0],name[1])
+         if os.sys.platform == "win32":
+             path = path.lower()
+         path = self.build_name(path,name)
+         return path
 
     def create_link_file(self,name,path):
         self.cur_name = self.link_path(name,path)