diff --git a/ChangeLog b/ChangeLog
index c3bdf4ee..ad7e1f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
     Changed: linkcheck/httplib2.py
   * catch errors earlier in recursion check
     Changed: linkcheck/UrlData.py
-  * quote url in log output
+  * quote url and parent url in log output
     Changed: linkcheck/log/*.py
     Added: linkcheck/url.py
 
diff --git a/linkcheck/log/CSVLogger.py b/linkcheck/log/CSVLogger.py
index d5195a3b..bacad2f7 100644
--- a/linkcheck/log/CSVLogger.py
+++ b/linkcheck/log/CSVLogger.py
@@ -20,6 +20,7 @@ from linkcheck.log import strtime, strduration
 from StandardLogger import StandardLogger
 from Logger import Logger
 from linkcheck import Config, i18n
+from linkcheck.url import url_quote
 
 class CSVLogger (StandardLogger):
     """ CSV output. CSV consists of one line per entry. Entries are
@@ -65,10 +66,10 @@ class CSVLogger (StandardLogger):
     def newUrl (self, urlData):
         if self.fd is None: return
         row = [urlData.urlName, urlData.recursionLevel,
-               urlData.parentName, urlData.baseRef,
+               url_quote(urlData.parentName), urlData.baseRef,
                urlData.errorString, urlData.validString,
                urlData.warningString, urlData.infoString,
-               urlData.valid, urlData.url,
+               urlData.valid, url_quote(urlData.url),
                urlData.line, urlData.column,
                urlData.name, urlData.dltime,
                urlData.dlsize, urlData.checktime,
diff --git a/linkcheck/log/ColoredLogger.py b/linkcheck/log/ColoredLogger.py
index 2f36732a..33cb548c 100644
--- a/linkcheck/log/ColoredLogger.py
+++ b/linkcheck/log/ColoredLogger.py
@@ -49,7 +49,7 @@ class ColoredLogger (StandardLogger):
                         self.fd.write("o\n")
                     self.fd.write("\n"+self.field("parenturl")+
                               self.spaces("parenturl")+
-		              self.colorparent+urlData.parentName+
+		              self.colorparent+url_quote(urlData.parentName)+
 			      self.colorreset+"\n")
                     self.currentPage = urlData.parentName
                     self.prefix = 1
diff --git a/linkcheck/log/HtmlLogger.py b/linkcheck/log/HtmlLogger.py
index f8e2ceb5..6e4b311a 100644
--- a/linkcheck/log/HtmlLogger.py
+++ b/linkcheck/log/HtmlLogger.py
@@ -86,7 +86,8 @@ class HtmlLogger (StandardLogger):
         if urlData.parentName and self.has_field("parenturl"):
             self.fd.write("<tr>\n<td>"+self.field("parenturl")+
                '</td>\n<td><a target="top" href="'+
-               urlData.parentName+'">'+urlData.parentName+"</a>")
+               url_quote(urlData.parentName)+'">'+
+               url_quote(urlData.parentName)+"</a>")
             if urlData.line:
                 self.fd.write(i18n._(", line %d")%urlData.line)
             if urlData.column:
diff --git a/linkcheck/log/SQLLogger.py b/linkcheck/log/SQLLogger.py
index 09820623..bbbfdd0d 100644
--- a/linkcheck/log/SQLLogger.py
+++ b/linkcheck/log/SQLLogger.py
@@ -53,7 +53,7 @@ class SQLLogger (StandardLogger):
 	      (self.dbname,
 	       StringUtil.sqlify(urlData.urlName),
                urlData.recursionLevel,
-	       StringUtil.sqlify(urlData.parentName),
+	       StringUtil.sqlify(url_quote(urlData.parentName)),
                StringUtil.sqlify(urlData.baseRef),
                StringUtil.sqlify(urlData.errorString),
                StringUtil.sqlify(urlData.validString),
diff --git a/linkcheck/log/StandardLogger.py b/linkcheck/log/StandardLogger.py
index a5f76259..47ecea18 100644
--- a/linkcheck/log/StandardLogger.py
+++ b/linkcheck/log/StandardLogger.py
@@ -94,7 +94,7 @@ __init__(self, **args)
                           urlData.name+"\n")
         if urlData.parentName and self.has_field('parenturl'):
             self.fd.write(self.field('parenturl')+self.spaces("parenturl")+
-	                  urlData.parentName+
+	                  url_quote(urlData.parentName)+
                           (i18n._(", line %d")%urlData.line)+
                           (i18n._(", col %d")%urlData.column)+"\n")
         if urlData.baseRef and self.has_field('base'):