diff --git a/ikiwiki b/ikiwiki
index 3cf2a7cb3..2dbb42bc4 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -156,14 +156,14 @@ sub debug ($) { #{{{
 sub basename ($) { #{{{
 	my $file=shift;
 
-	$file=~s!.*/!!;
+	$file=~s!.*/+!!;
 	return $file;
 } #}}}
 
 sub dirname ($) { #{{{
 	my $file=shift;
 
-	$file=~s!/?[^/]+$!!;
+	$file=~s!/*[^/]+$!!;
 	return $file;
 } #}}}