diff --git a/libraries/libstratosphere/include/stratosphere/fs.hpp b/libraries/libstratosphere/include/stratosphere/fs.hpp
index d66b690c2..f9df48d3e 100644
--- a/libraries/libstratosphere/include/stratosphere/fs.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs.hpp
@@ -45,7 +45,8 @@
 #include <stratosphere/fs/fs_save_data_types.hpp>
 #include <stratosphere/fs/fs_save_data_management.hpp>
 #include <stratosphere/fs/fs_save_data_transaction.hpp>
+#include <stratosphere/fs/fs_device_save_data.hpp>
+#include <stratosphere/fs/fs_system_save_data.hpp>
 #include <stratosphere/fs/fs_sd_card.hpp>
 #include <stratosphere/fs/fs_signed_system_partition.hpp>
 #include <stratosphere/fs/fs_system_data.hpp>
-#include <stratosphere/fs/fs_system_save_data.hpp>
diff --git a/libraries/libstratosphere/include/stratosphere/fs/fs_device_save_data.hpp b/libraries/libstratosphere/include/stratosphere/fs/fs_device_save_data.hpp
new file mode 100644
index 000000000..b70170382
--- /dev/null
+++ b/libraries/libstratosphere/include/stratosphere/fs/fs_device_save_data.hpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "fs_common.hpp"
+#include "fs_save_data_types.hpp"
+
+namespace ams::fs {
+
+    Result MountDeviceSaveData(const char *name);
+    Result MountDeviceSaveData(const char *name, const ncm::ApplicationId application_id);
+
+}
diff --git a/libraries/libstratosphere/source/fs/fs_device_save_data.cpp b/libraries/libstratosphere/source/fs/fs_device_save_data.cpp
new file mode 100644
index 000000000..3e7a8e83e
--- /dev/null
+++ b/libraries/libstratosphere/source/fs/fs_device_save_data.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <stratosphere.hpp>
+#include "fsa/fs_mount_utils.hpp"
+
+namespace ams::fs {
+
+    namespace {
+
+        constexpr inline SaveDataSpaceId DeviceSaveDataSpaceId = SaveDataSpaceId::User;
+
+        Result MountDeviceSaveDataImpl(const char *name, const SaveDataAttribute &attribute) {
+            /* Validate the mount name. */
+            R_TRY(impl::CheckMountName(name));
+
+            /* Open the filesystem, use libnx bindings. */
+            ::FsFileSystem fs;
+            R_TRY(fsOpenSaveDataFileSystem(std::addressof(fs), static_cast<::FsSaveDataSpaceId>(DeviceSaveDataSpaceId), reinterpret_cast<const ::FsSaveDataAttribute *>(std::addressof(attribute))));
+
+            /* Allocate a new filesystem wrapper. */
+            auto fsa = std::make_unique<RemoteFileSystem>(fs);
+            R_UNLESS(fsa != nullptr, fs::ResultAllocationFailureInDeviceSaveDataA());
+
+            /* Register. */
+            return fsa::Register(name, std::move(fsa));
+        }
+
+    }
+
+    Result MountDeviceSaveData(const char *name) {
+        return MountDeviceSaveDataImpl(name, SaveDataAttribute::Make(ncm::InvalidProgramId, SaveDataType::Device, InvalidUserId, InvalidSystemSaveDataId));
+    }
+
+    Result MountDeviceSaveData(const char *name, const ncm::ApplicationId application_id) {
+        return MountDeviceSaveDataImpl(name, SaveDataAttribute::Make(application_id, SaveDataType::Device, InvalidUserId, InvalidSystemSaveDataId));
+    }
+
+}
diff --git a/libraries/libvapours/include/vapours/results/fs_results.hpp b/libraries/libvapours/include/vapours/results/fs_results.hpp
index 6566b85ac..2f5d74fd6 100644
--- a/libraries/libvapours/include/vapours/results/fs_results.hpp
+++ b/libraries/libvapours/include/vapours/results/fs_results.hpp
@@ -63,6 +63,7 @@ namespace ams::fs {
         R_DEFINE_ERROR_RESULT(AllocationFailureInContentStorageB,             3221);
         R_DEFINE_ERROR_RESULT(AllocationFailureInDataA,                       3222);
         R_DEFINE_ERROR_RESULT(AllocationFailureInDataB,                       3223);
+        R_DEFINE_ERROR_RESULT(AllocationFailureInDeviceSaveDataA,             3224);
         R_DEFINE_ERROR_RESULT(AllocationFailureInGameCardA,                   3225);
         R_DEFINE_ERROR_RESULT(AllocationFailureInGameCardB,                   3226);
         R_DEFINE_ERROR_RESULT(AllocationFailureInGameCardC,                   3227);