diff --git a/src/js/restore.js b/src/js/restore.js
index cfc38a829..eab72e5dd 100644
--- a/src/js/restore.js
+++ b/src/js/restore.js
@@ -178,7 +178,8 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
         { name: 'SSHFS Mount', value: 'sshfs' },
         { name: 'UpCloud Object Storage', value: 'upcloud-objectstorage' },
         { name: 'Vultr Object Storage', value: 'vultr-objectstorage' },
-        { name: 'Wasabi', value: 'wasabi' }
+        { name: 'Wasabi', value: 'wasabi' },
+        { name: 'XFS Disk', value: 'xfs' },
     ];
 
     $scope.formats = [
@@ -194,7 +195,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
     };
 
     $scope.mountlike = function (provider) {
-        return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'mountpoint' || provider === 'ext4';
+        return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'mountpoint' || provider === 'ext4' || provider === 'xfs';
     };
 
     $scope.restore = function () {
@@ -288,7 +289,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
                     backupConfig.mountOptions.port = $scope.mountOptions.port;
                     backupConfig.mountOptions.privateKey = $scope.mountOptions.privateKey;
                 }
-            } else if (backupConfig.provider === 'ext4') {
+            } else if (backupConfig.provider === 'ext4' || backupConfig.provider === 'xfs') {
                 backupConfig.mountOptions.diskPath = $scope.mountOptions.diskPath;
             } else if (backupConfig.provider === 'mountpoint') {
                 backupConfig.mountPoint = $scope.mountPoint;
diff --git a/src/restore.html b/src/restore.html
index 7b05cdbc4..cad5a2a0f 100644
--- a/src/restore.html
+++ b/src/restore.html
@@ -130,10 +130,10 @@
                                     <input type="password" class="form-control" ng-model="mountOptions.password" id="configureBackupPassword" name="cifsPassword" ng-disabled="busy" password-reveal>
                                 </div>
 
-                                <!-- EXT4 -->
-                                <div class="form-group" ng-class="{ 'has-error': error.diskPath }" ng-show="provider === 'ext4'">
+                                <!-- EXT4/XFS -->
+                                <div class="form-group" ng-class="{ 'has-error': error.diskPath }" ng-show="provider === 'ext4' || provider === 'xfs'">
                                     <label class="control-label" for="inputConfigureDiskPath">Disk Path</label>
-                                    <input type="text" class="form-control" ng-model="mountOptions.diskPath" id="inputConfigureDiskPath" name="diskPath" ng-disabled="busy" placeholder="Directory for backups" ng-required="provider === 'ext4'">
+                                    <input type="text" class="form-control" ng-model="mountOptions.diskPath" id="inputConfigureDiskPath" name="diskPath" ng-disabled="busy" placeholder="Directory for backups" ng-required="provider === 'ext4' || provider === 'xfs'">
                                 </div>
 
                                 <!-- SSHFS -->
diff --git a/src/views/app.js b/src/views/app.js
index 889b79731..08bf1341c 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -118,6 +118,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         { name: 'Vultr Object Storage', value: 'vultr-objectstorage' },
         // { name: 'No-op (Only for testing)', value: 'noop' },
         { name: 'Wasabi', value: 'wasabi' }
+        // { name: 'XFS', value: 'xfs' }
     ];
 
     $scope.formats = [
diff --git a/src/views/backups.html b/src/views/backups.html
index 7cd7ca7e9..0d58a21fb 100644
--- a/src/views/backups.html
+++ b/src/views/backups.html
@@ -208,9 +208,9 @@
           </div>
 
           <!-- EXT4 -->
-          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.diskPath || !configureBackup.mountOptions.diskPath }" ng-show="configureBackup.provider === 'ext4'">
+          <div class="form-group" ng-class="{ 'has-error': configureBackup.error.diskPath || !configureBackup.mountOptions.diskPath }" ng-show="configureBackup.provider === 'ext4' || configureBackup.provider === 'xfs'">
             <label class="control-label" for="inputConfigureDiskPath">{{ 'backups.configureBackupStorage.diskPath' | tr }}</label>
-            <input type="text" class="form-control" ng-model="configureBackup.mountOptions.diskPath" id="inputConfigureDiskPath" name="diskPath" ng-disabled="configureBackup.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="configureBackup.provider === 'ext4'">
+            <input type="text" class="form-control" ng-model="configureBackup.mountOptions.diskPath" id="inputConfigureDiskPath" name="diskPath" ng-disabled="configureBackup.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="configureBackup.provider === 'ext4' || configureBackup.provider === 'xfs'">
           </div>
 
           <!-- SSHFS -->
@@ -462,7 +462,7 @@
         <span ng-show="backupConfig.provider === 'filesystem'">{{ backupConfig.backupFolder }}</span>
         <span ng-show="mountlike(backupConfig.provider)">
           <i class="fa fa-circle" ng-style="{ color: backupConfig.mountStatus.state === 'active' ? '#27CE65' : '#d9534f' }" ng-show="backupConfig.mountStatus" uib-tooltip="{{ backupConfig.mountStatus.message }}"></i>
-          <span ng-show="backupConfig.provider === 'filesystem' || backupConfig.provider === 'ext4' || backupConfig.provider === 'mountpoint'">{{ backupConfig.mountOptions.diskPath || backupConfig.mountPoint }}{{ (backupConfig.prefix ? '/' : '') + backupConfig.prefix }}</span>
+          <span ng-show="backupConfig.provider === 'filesystem' || backupConfig.provider === 'ext4' || backupConfig.provider === 'xfs' || backupConfig.provider === 'mountpoint'">{{ backupConfig.mountOptions.diskPath || backupConfig.mountPoint }}{{ (backupConfig.prefix ? '/' : '') + backupConfig.prefix }}</span>
           <span ng-show="backupConfig.provider === 'cifs' || backupConfig.provider === 'nfs' || backupConfig.provider === 'sshfs'">{{ backupConfig.mountOptions.host }}:{{ backupConfig.mountOptions.remoteDir }}{{ (backupConfig.prefix ? '/' : '') + backupConfig.prefix }}</span>
         </span>
 
diff --git a/src/views/backups.js b/src/views/backups.js
index db00aa33c..7e179a00f 100644
--- a/src/views/backups.js
+++ b/src/views/backups.js
@@ -138,6 +138,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
         { name: 'UpCloud Object Storage', value: 'upcloud-objectstorage' },
         { name: 'Vultr Object Storage', value: 'vultr-objectstorage' },
         { name: 'Wasabi', value: 'wasabi' },
+        { name: 'XFS', value: 'xfs' },
         { name: 'No-op (Only for testing)', value: 'noop' }
     ];
 
@@ -344,7 +345,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
     };
 
     $scope.mountlike = function (provider) {
-        return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'mountpoint' || provider === 'ext4';
+        return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'mountpoint' || provider === 'ext4' || provider === 'xfs';
     };
 
     // https://stackoverflow.com/questions/3665115/how-to-create-a-file-in-memory-for-user-to-download-but-not-through-server#18197341
@@ -714,7 +715,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
                         backupConfig.mountOptions.port = $scope.configureBackup.mountOptions.port;
                         backupConfig.mountOptions.privateKey = $scope.configureBackup.mountOptions.privateKey;
                     }
-                } else if (backupConfig.provider === 'ext4') {
+                } else if (backupConfig.provider === 'ext4' || backupConfig.provider === 'xfs') {
                     backupConfig.mountOptions.diskPath = $scope.configureBackup.mountOptions.diskPath;
                 } else if (backupConfig.provider === 'mountpoint') {
                     backupConfig.mountPoint = $scope.configureBackup.mountPoint;
diff --git a/src/views/volumes.html b/src/views/volumes.html
index 4eb695217..014cd4be1 100644
--- a/src/views/volumes.html
+++ b/src/views/volumes.html
@@ -33,7 +33,7 @@
             </div>
 
             <div uib-collapse="volumeAdd.mountType === 'mountpoint' || volumeAdd.mountType === 'filesystem'">
-              <div class="form-group" ng-show="volumeAdd.mountType === 'ext4'">
+              <div class="form-group" ng-show="volumeAdd.mountType === 'ext4' || volumeAdd.mountType === 'xfs'">
                 <label class="control-label" for="volumeAddHost">{{ 'volumes.addVolumeDialog.diskPath' | tr }}</label>
                 <input type="text" class="form-control" ng-model="volumeAdd.diskPath" id="volumeAddDiskPath" name="diskPath" ng-disabled="volumeAdd.busy" placeholder="/dev/disk/by-uuid/uuid">
               </div>
diff --git a/src/views/volumes.js b/src/views/volumes.js
index 8dc318145..68a4f9ad3 100644
--- a/src/views/volumes.js
+++ b/src/views/volumes.js
@@ -20,6 +20,7 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
         { name: 'Filesystem (Mountpoint)', value: 'mountpoint' },
         { name: 'NFS', value: 'nfs' },
         { name: 'SSHFS', value: 'sshfs' },
+        { name: 'XFS', value: 'xfs' },
     ];
 
     function refreshVolumes(callback) {
@@ -57,7 +58,7 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
 
     // same as box/mounts.js
     $scope.isMountProvider = function (provider) {
-        return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'ext4';
+        return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'ext4' || provider === 'xfs';
     };
 
     $scope.remount = function (volume) {
@@ -145,7 +146,7 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
                     user: $scope.volumeAdd.user,
                     privateKey: $scope.volumeAdd.privateKey,
                 };
-            } else if ($scope.volumeAdd.mountType === 'ext4') {
+            } else if ($scope.volumeAdd.mountType === 'ext4' || $scope.volumeAdd.mountType === 'xfs') {
                 mountOptions = {
                     diskPath: $scope.volumeAdd.diskPath
                 };