diff --git a/layouts/_default/_markup/render-link.atom.xml b/layouts/_default/_markup/render-link.atom.xml
index ce4dadc..a2033b4 100644
--- a/layouts/_default/_markup/render-link.atom.xml
+++ b/layouts/_default/_markup/render-link.atom.xml
@@ -1,12 +1,12 @@
 {{- $parsedDest := urls.Parse (.Destination | absURL) -}}
-{{- if (strings.HasPrefix .Destination "#") -}}<!-- if it's a fragment -->
-	<a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
-{{- else if not (strings.HasPrefix .Destination $parsedDest.Scheme) -}}<!-- if it's a relative url -->
-	{{- $baseURL := trim .Page.Site.BaseURL "/" -}}
-	{{- $fragment := "" -}}
-	{{- with $parsedDest.Fragment -}}{{- $fragment = printf "#%s" . -}}{{- end -}}
-	{{- $href := printf "%s%s%s" $baseURL $parsedDest.Path $fragment | absURL -}}
-	<a href="{{ $href }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
+{{- if (strings.HasPrefix .Destination "#") -}}
+<a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
+{{- else if not (strings.HasPrefix .Destination $parsedDest.Scheme) -}}
+{{- $baseURL := trim .Page.Site.BaseURL "/" -}}
+{{- $fragment := "" -}}
+{{- with $parsedDest.Fragment -}}{{- $fragment = printf "#%s" . -}}{{- end -}}
+{{- $href := printf "%s%s%s" $baseURL $parsedDest.Path $fragment | absURL -}}
+<a href="{{ $href }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
 {{- else -}}
-	<a href="{{ .Destination | htmlEscape }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
+<a href="{{ .Destination | htmlEscape }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
 {{- end -}}
diff --git a/layouts/_default/_markup/render-link.rss.xml b/layouts/_default/_markup/render-link.rss.xml
index e81c9ea..246f6ae 100644
--- a/layouts/_default/_markup/render-link.rss.xml
+++ b/layouts/_default/_markup/render-link.rss.xml
@@ -1,12 +1,12 @@
 {{- $parsedDest := urls.Parse (.Destination | absURL) -}}
-{{- if (strings.HasPrefix .Destination "#") -}}<!-- if it's a fragment -->
-	<a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
-{{- else if not (strings.HasPrefix .Destination $parsedDest.Scheme) -}}<!-- if it's a relative url -->
-	{{- $baseURL := trim .Page.Site.BaseURL "/" -}}
-	{{- $fragment := "" -}}
-	{{- with $parsedDest.Fragment -}}{{- $fragment = printf "#%s" . -}}{{- end -}}
-	{{- $href := printf "%s%s%s" $baseURL $parsedDest.Path $fragment | absURL -}}
-	<a href="{{ $href }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
+{{- if (strings.HasPrefix .Destination "#") -}}
+<a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
+{{- else if not (strings.HasPrefix .Destination $parsedDest.Scheme) -}}
+{{- $baseURL := trim .Page.Site.BaseURL "/" -}}
+{{- $fragment := "" -}}
+{{- with $parsedDest.Fragment -}}{{- $fragment = printf "#%s" . -}}{{- end -}}
+{{- $href := printf "%s%s%s" $baseURL $parsedDest.Path $fragment | absURL -}}
+<a href="{{ $href }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
 {{- else -}}
-	<a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
+<a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ .Text | safeHTML }}</a>
 {{- end -}}
diff --git a/scripts/xhtmlize.sh b/scripts/xhtmlize.sh
index 796fd37..c18d856 100644
--- a/scripts/xhtmlize.sh
+++ b/scripts/xhtmlize.sh
@@ -20,4 +20,5 @@ trap cleanup EXIT
 export XMLLINT_INDENT='	'
 export OUTPUT_DIR="$output_dir"
 find "$output_dir" -type f -name '*.html' -exec sh "$script_dir/xhtmlize-single-file.sh" {} \;
+find "$output_dir" -type f -name '*.xml' -exec xmllint --noblanks --encode UTF-8 --noent {} --output {} \;
 # done