diff --git a/config/config.sample.php b/config/config.sample.php
index 402c84fe0c7721efea40863f93c7e37de3052ebe..a0f3e0a4e726dfaeb02e43a129058cf74420f97d 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -222,6 +222,11 @@ $CONFIG = array(
  */
 // "datadirectory" => "",
 
+/* The directory where the skeleton files are located. These files will be copied to the data
+ * directory of new users. Leave empty to not copy any skeleton files.
+ */
+// "skeletondirectory" => "",
+
 /* Enable maintenance mode to disable ownCloud
    If you want to prevent users to login to ownCloud before you start doing some maintenance work,
    you need to set the value of the maintenance parameter to true.
diff --git a/lib/private/util.php b/lib/private/util.php
index be4aac695646750f886cae77ce2cac065f182cff..f46f5983d211380cad9819c5a0fc921424fce0e0 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -208,7 +208,10 @@ class OC_Util {
 	 * @param string $userDirectory
 	 */
 	public static function copySkeleton($userDirectory) {
-		OC_Util::copyr(\OC::$SERVERROOT.'/core/skeleton' , $userDirectory);
+		$skeletonDirectory = OC_Config::getValue('skeletondirectory', \OC::$SERVERROOT.'/core/skeleton');
+		if (!empty($skeletonDirectory)) {
+			OC_Util::copyr($skeletonDirectory , $userDirectory);
+		}
 	}
 
 	/**