diff --git a/util/mkdir-p.pl b/util/mkdir-p.pl
index 2c003d6e8491369f9d49a6f0aff8fd0b3ac96849..6c69c2daa4d0824cf1b35a9a5540aa0eecd95529 100755
--- a/util/mkdir-p.pl
+++ b/util/mkdir-p.pl
@@ -15,19 +15,19 @@ foreach $arg (@ARGV) {
 sub do_mkdir_p {
   local($dir) = @_;
 
-  $dir =~ s|/*$||;
+  $dir =~ s|/*\Z(?!\n)||s;
 
   if (-d $dir) {
     return;
   }
 
-  if ($dir =~ /\//) {
+  if ($dir =~ m|[^/]/|s) {
     local($parent) = $dir;
-    $parent =~ s|[^/]*$||;
+    $parent =~ s|[^/]*\Z(?!\n)||s;
 
     do_mkdir_p($parent);
   }
 
   mkdir($dir, 0777) || die "Cannot create directory $dir: $!\n";
-  print "created directory $dir\n";
+  print "created directory `$dir'\n";
 }