diff --git a/apps/blagh/atom.tpl b/apps/blagh/atom.tpl
index 049a1eb..b4bcb5e 100644
--- a/apps/blagh/atom.tpl
+++ b/apps/blagh/atom.tpl
@@ -8,7 +8,7 @@ fn statpost {
     f = $1
 
     updated = `{/bin/date --rfc-3339'=seconds' -r $f |tr ' ' 'T'} 
-    post_uri=$base_url^`{cleanname `{echo $f | sed -e 's!^'$sitedir'!!' -e 's/\.(md|tpl)$//g'}}
+    post_uri=$base_url^`{cleanname `{echo $f | sed -e 's!^'$sitedir'!!'}}^'/'
     title=`{read $f/index.md}
     # Not used: date=`{/bin/date -Rd `{basename $f |sed 's/(^[0-9\-]*).*/\1/; s/-[0-9]$//'}}
     # TODO: use mtime(1) and ls(1) instead of lunix's stat(1)
diff --git a/apps/blagh/rss20.tpl b/apps/blagh/rss20.tpl
index 4214c35..c64ef64 100644
--- a/apps/blagh/rss20.tpl
+++ b/apps/blagh/rss20.tpl
@@ -13,7 +13,7 @@ fn statpost {
     # TODO: use mtime(1) and ls(1) instead of lunix's stat(1)
     stat=`{stat -c '%Y %U' $f}
     #mdate=`{/bin/date -Rd $stat(1)} # Not used because it is unreliable
-    post_uri=$base_url^`{cleanname `{echo -n $post_uri | sed 's/\.(md|tpl)//g'}}
+    post_uri=$base_url^`{cleanname `{echo $f | sed -e 's!^'$sitedir'!!'}}^'/'
     by=$stat(2)
     ifs=() { summary=`{cat $f/index.md | $formatter | escape_html} }
 }