diff --git a/manifests/mount.pp b/manifests/mount.pp
index 43ba051..d5b0a6f 100644
--- a/manifests/mount.pp
+++ b/manifests/mount.pp
@@ -12,7 +12,8 @@
     fail("Autofs::Mount options string must start with -, and not contain spaces. Got: ${options}")
   }
 
-  if dirname($mountpoint) == '/' {
+  if $mountpoint =~ /^[\/]([[0-9a-zA-Z\.\/_\s-]]*)*[\/]$/ {
+
     $dirname = '/-'
     $basename = $mountpoint
   } else {