diff --git a/manifests/mountpoints.pp b/manifests/mountpoints.pp
index d2ac7122..3f890ef8 100644
--- a/manifests/mountpoints.pp
+++ b/manifests/mountpoints.pp
@@ -1,29 +1,31 @@
 # Handle mount points
 class profile::mountpoints {
   $mountpoints = hiera_hash('mountpoints')
 
   each($mountpoints) |$mountpoint, $config| {
     if (has_key($config, 'options') and $config['options'] =~ Array) {
       $mount_config = $config + {
         options => join($config['options'], ','),
       }
     } else {
       $mount_config = $config
     }
 
-    file {$mountpoint:
-      ensure => directory,
-    }
+    exec {"create ${mountpoint}":
+      creates => $mountpoint,
+      command => "mkdir -p ${mountpoint}",
+      path    => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
+    } -> file {$mountpoint:}
 
     mount {
       default:
         ensure  => present,
         dump    => 0,
         pass    => 0,
         options => 'defaults';
       $mountpoint:
         *       => $mount_config,
         require => File[$mountpoint],
     }
   }
 }