diff --git a/apps/files_versions/composer/composer/autoload_classmap.php b/apps/files_versions/composer/composer/autoload_classmap.php
index ad026d512f48ee03a1fd64f38153fe9737f68e62..4bb112b4f11b964c1c58e6e170b3ce9f5ad59510 100644
--- a/apps/files_versions/composer/composer/autoload_classmap.php
+++ b/apps/files_versions/composer/composer/autoload_classmap.php
@@ -16,6 +16,7 @@ return array(
     'OCA\\Files_Versions\\Events\\CreateVersionEvent' => $baseDir . '/../lib/Events/CreateVersionEvent.php',
     'OCA\\Files_Versions\\Expiration' => $baseDir . '/../lib/Expiration.php',
     'OCA\\Files_Versions\\Hooks' => $baseDir . '/../lib/Hooks.php',
+    'OCA\\Files_Versions\\Sabre\\RestoreFolder' => $baseDir . '/../lib/Sabre/RestoreFolder.php',
     'OCA\\Files_Versions\\Sabre\\RootCollection' => $baseDir . '/../lib/Sabre/RootCollection.php',
     'OCA\\Files_Versions\\Sabre\\VersionCollection' => $baseDir . '/../lib/Sabre/VersionCollection.php',
     'OCA\\Files_Versions\\Sabre\\VersionFile' => $baseDir . '/../lib/Sabre/VersionFile.php',
diff --git a/apps/files_versions/composer/composer/autoload_static.php b/apps/files_versions/composer/composer/autoload_static.php
index 9efed6f4884cd79613c02e01ab4fe4d554ba8080..29bc592b41c9ca15675284eb4a1032a57062c231 100644
--- a/apps/files_versions/composer/composer/autoload_static.php
+++ b/apps/files_versions/composer/composer/autoload_static.php
@@ -31,6 +31,7 @@ class ComposerStaticInitFiles_Versions
         'OCA\\Files_Versions\\Events\\CreateVersionEvent' => __DIR__ . '/..' . '/../lib/Events/CreateVersionEvent.php',
         'OCA\\Files_Versions\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php',
         'OCA\\Files_Versions\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
+        'OCA\\Files_Versions\\Sabre\\RestoreFolder' => __DIR__ . '/..' . '/../lib/Sabre/RestoreFolder.php',
         'OCA\\Files_Versions\\Sabre\\RootCollection' => __DIR__ . '/..' . '/../lib/Sabre/RootCollection.php',
         'OCA\\Files_Versions\\Sabre\\VersionCollection' => __DIR__ . '/..' . '/../lib/Sabre/VersionCollection.php',
         'OCA\\Files_Versions\\Sabre\\VersionFile' => __DIR__ . '/..' . '/../lib/Sabre/VersionFile.php',
diff --git a/apps/files_versions/lib/Sabre/RestoreFolder.php b/apps/files_versions/lib/Sabre/RestoreFolder.php
new file mode 100644
index 0000000000000000000000000000000000000000..c398d02692bf47a8cd199cf436ae6b51d3babacf
--- /dev/null
+++ b/apps/files_versions/lib/Sabre/RestoreFolder.php
@@ -0,0 +1,86 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_Versions\Sabre;
+
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\ICollection;
+use Sabre\DAV\IMoveTarget;
+use Sabre\DAV\INode;
+
+
+class RestoreFolder implements ICollection, IMoveTarget {
+
+	/** @var string */
+	protected $userId;
+
+	public function __construct(string $userId) {
+		$this->userId = $userId;
+	}
+
+	public function createFile($name, $data = null) {
+		throw new Forbidden();
+	}
+
+	public function createDirectory($name) {
+		throw new Forbidden();
+	}
+
+	public function getChild($name) {
+		return null;
+	}
+
+	public function delete() {
+		throw new Forbidden();
+	}
+
+	public function getName() {
+		return 'restore';
+	}
+
+	public function setName($name) {
+		throw new Forbidden();
+	}
+
+	public function getLastModified(): int {
+		return 0;
+	}
+
+	public function getChildren(): array {
+		return [];
+	}
+
+	public function childExists($name): bool {
+		return false;
+	}
+
+	public function moveInto($targetName, $sourcePath, INode $sourceNode): bool {
+		if (!($sourceNode instanceof VersionFile)) {
+			return false;
+		}
+
+		return $sourceNode->rollBack();
+	}
+
+}
diff --git a/apps/files_versions/lib/Sabre/VersionCollection.php b/apps/files_versions/lib/Sabre/VersionCollection.php
index a9c83fe475a7f9ea3bc41933324821ec45b56cd9..96a5e06bc2558096841adf539baa7c6001ed6561 100644
--- a/apps/files_versions/lib/Sabre/VersionCollection.php
+++ b/apps/files_versions/lib/Sabre/VersionCollection.php
@@ -55,6 +55,14 @@ class VersionCollection implements ICollection {
 	}
 
 	public function getChild($name) {
+		/** @var VersionFile[] $versions */
+		$versions = $this->getChildren();
+
+		foreach ($versions as $version) {
+			if ($version->getName() === $name) {
+				return $version;
+			}
+		}
 
 		throw new NotFound();
 	}
diff --git a/apps/files_versions/lib/Sabre/VersionFile.php b/apps/files_versions/lib/Sabre/VersionFile.php
index 52bc9b4898b4d170a7ce9db2ffe273a5ad51f285..b84215cb3d6c420d7e7a88b63b945b3632b48ddd 100644
--- a/apps/files_versions/lib/Sabre/VersionFile.php
+++ b/apps/files_versions/lib/Sabre/VersionFile.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
  */
 namespace OCA\Files_Versions\Sabre;
 
+use OCA\Files_Versions\Storage;
 use OCP\Files\FileInfo;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\IFile;
@@ -70,4 +71,8 @@ class VersionFile implements IFile {
 	public function getLastModified(): int {
 		return (int)$this->data['version'];
 	}
+
+	public function rollBack(): bool {
+		return Storage::rollback($this->data['path'], $this->data['version']);
+	}
 }
diff --git a/apps/files_versions/lib/Sabre/VersionHome.php b/apps/files_versions/lib/Sabre/VersionHome.php
index 8ad9345f25e87fef466d4d693dbd4a1f9c1b3fb3..7a99d2376d4acd4dfc3ddf30d76ae20a41fec87a 100644
--- a/apps/files_versions/lib/Sabre/VersionHome.php
+++ b/apps/files_versions/lib/Sabre/VersionHome.php
@@ -66,6 +66,9 @@ class VersionHome implements ICollection {
 		if ($name === 'versions') {
 			return new VersionRoot($userId, $this->rootFolder);
 		}
+		if ($name === 'restore') {
+			return new RestoreFolder($userId);
+		}
 	}
 
 	public function getChildren() {
@@ -73,6 +76,7 @@ class VersionHome implements ICollection {
 
 		return [
 			new VersionRoot($userId, $this->rootFolder),
+			new RestoreFolder($userId),
 		];
 	}