diff --git a/site-modules/profile/manifests/mountpoints.pp b/site-modules/profile/manifests/mountpoints.pp
index 0f94b6ac..f909ce95 100644
--- a/site-modules/profile/manifests/mountpoints.pp
+++ b/site-modules/profile/manifests/mountpoints.pp
@@ -1,32 +1,35 @@
 # Handle mount points
 class profile::mountpoints {
   $mountpoints = lookup('mountpoints', Hash, 'hash')
 
   each($mountpoints) |$mountpoint, $config| {
     if (has_key($config, 'options') and $config['options'] =~ Array) {
       $mount_config = $config + {
         options => join($config['options'], ','),
       }
     } else {
       $mount_config = $config
     }
 
     if pick($config['ensure'], 'present') != 'absent' {
-      exec {"create ${mountpoint}":
-        creates => $mountpoint,
-        command => "mkdir -p ${mountpoint}",
-        path    => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
+      if ($mountpoint[0] == '/') {
+        exec {"create ${mountpoint}":
+          creates => $mountpoint,
+          command => "mkdir -p ${mountpoint}",
+          path    => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
+        }
+        -> file {$mountpoint:}
+        -> Mount[$mountpoint]
       }
-      -> file {$mountpoint:}
-      -> mount {
+      mount {
         default:
           ensure  => present,
           dump    => 0,
           pass    => 0,
           options => 'defaults';
         $mountpoint:
           *       => $mount_config,
       }
     }
   }
 }