diff --git a/src/html.ml b/src/html.ml
index 50859d3..b0fa9e3 100644
--- a/src/html.ml
+++ b/src/html.ml
@@ -40,7 +40,8 @@ let of_ymd ?(header_tpl=None) ?(text_tpl=None) blog_url lgrn ymd =
 
 let article_link entry =
   let module E = Logarion.Entry in
-  li [a ~a:[a_href (uri_of_string ("/text/" ^ Filename.chop_extension (Filename.basename entry.E.filepath)))]
+  let u = "/text/" ^ Filename.(entry.E.filepath |> basename |> chop_extension) in
+  li [a ~a:[a_href (uri_of_string u)]
         [Unsafe.data (Ymd.(entry.meta.title) ^ Ymd.Date.(pretty_date @@ last entry.meta.date)) ]
      ]
 
diff --git a/src/template.ml b/src/template.ml
index 091a70d..80355dd 100644
--- a/src/template.ml
+++ b/src/template.ml
@@ -47,7 +47,7 @@ let fold_text ymd =
 let fold_entry (entry : Logarion.Entry.t) =
   let meta = entry.meta in
   let escaped e = match e with
-    | "url" -> "text/" ^ Filename.chop_extension entry.Logarion.Entry.filepath
+    | "url" -> "/text/" ^ Filename.(entry.Logarion.Entry.filepath |> basename |> chop_extension)
     | "title" -> meta.title
     | "abstract" -> meta.abstract
     | "author_name" -> meta.author.Author.name
@@ -73,7 +73,7 @@ let fold_header blog_url title =
 
 let fold_index ?(entry_tpl=None) lgrn =
   let simple entry =
-    "<li><a href=\"/text/" ^ Filename.chop_extension entry.Logarion.Entry.filepath ^ "\">"
+    "<li><a href=\"/text/" ^ Filename.(entry.Logarion.Entry.filepath |> basename |> chop_extension) ^ "\">"
     ^ entry.meta.title ^ " ~ " ^ Ymd.Date.(pretty_date @@ last entry.meta.date) ^ "</a></li>" in
   let fold_entry tpl entry = fold_entry entry tpl in
   let entry = match entry_tpl with Some (Listing_entry e) -> fold_entry e | None -> simple in