diff --git a/lib/filesystem.php b/lib/filesystem.php
index 454bb1aa81a41243e39fc5e9775004caddc6aaac..ccbb4319757441810bf0410e40e02ce2aefc45a6 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -319,6 +319,9 @@ class OC_Filesystem{
 		if(substr($mountpoint,-1)!=='/'){
 			$mountpoint=$mountpoint.'/';
 		}
+		if ($mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
+			self::mkdir(basename($mountpoint));
+		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}