diff --git a/src/backups.js b/src/backups.js
index 19637bbb7..1bcf76b1a 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -89,6 +89,7 @@ function api(provider) {
         case 'caas': return caas;
         case 's3': return s3;
         case 'filesystem': return filesystem;
+        case 'minio': return s3;
         default: return null;
     }
 }
diff --git a/src/backuptask.js b/src/backuptask.js
index a27dc2278..6f8d77b83 100755
--- a/src/backuptask.js
+++ b/src/backuptask.js
@@ -26,6 +26,7 @@ function api(provider) {
         case 'caas': return caas;
         case 's3': return s3;
         case 'filesystem': return filesystem;
+        case 'minio': return s3;
         default: return null;
     }
 }
diff --git a/src/storage/s3.js b/src/storage/s3.js
index 7238752e7..33360c97d 100644
--- a/src/storage/s3.js
+++ b/src/storage/s3.js
@@ -198,6 +198,7 @@ function testConfig(apiConfig, callback) {
     if (typeof apiConfig.bucket !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'bucket must be a string'));
     if (typeof apiConfig.prefix !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'prefix must be a string'));
     if ('signatureVersion' in apiConfig && typeof apiConfig.prefix !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'signatureVersion must be a string'));
+    if ('endpoint' in apiConfig && typeof apiConfig.prefix !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'endpoint must be a string'));
 
     // attempt to upload and delete a file with new credentials
     getBackupCredentials(apiConfig, function (error, credentials) {
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index cb8c81608..549578b5a 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -161,15 +161,15 @@
                             <input type="text" class="form-control" ng-model="configureBackup.backupFolder" id="inputConfigureBackupFolder" name="backupFolder" ng-disabled="configureBackup.busy" placeholder="Leave empty for default /var/backups">
                         </div>
 
-                        <!-- S3 -->
-                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.bucket }" ng-show="configureBackup.provider === 's3'">
+                        <!-- S3/Minio -->
+                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.bucket }" ng-show="s3like(configureBackup.provider)">
                             <label class="control-label" for="inputConfigureBackupBucket">Bucket name</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.bucket" id="inputConfigureBackupBucket" name="bucket" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 's3'">
+                            <input type="text" class="form-control" ng-model="configureBackup.bucket" id="inputConfigureBackupBucket" name="bucket" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
                         </div>
 
-                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.prefix }" ng-show="configureBackup.provider === 's3'">
+                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.prefix }" ng-show="s3like(configureBackup.provider)">
                             <label class="control-label" for="inputConfigureBackupPrefix">Prefix</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.prefix" id="inputConfigureBackupPrefix" name="prefix" ng-disabled="configureBackup.busy" placeholder="Prefix for backup file names" ng-required="configureBackup.provider === 's3'">
+                            <input type="text" class="form-control" ng-model="configureBackup.prefix" id="inputConfigureBackupPrefix" name="prefix" ng-disabled="configureBackup.busy" placeholder="Prefix for backup file names" ng-required="s3like(configureBackup.provider)">
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }" ng-show="configureBackup.provider === 's3'">
@@ -177,19 +177,19 @@
                             <select class="form-control" name="region" id="inputConfigureBackupRegion" ng-model="configureBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 's3'"></select>
                         </div>
 
-                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.accessKeyId }" ng-show="configureBackup.provider === 's3'">
+                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.accessKeyId }" ng-show="s3like(configureBackup.provider)">
                             <label class="control-label" for="inputConfigureBackupAccessKeyId">Access key id</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.accessKeyId" id="inputConfigureBackupAccessKeyId" name="accessKeyId" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 's3'">
+                            <input type="text" class="form-control" ng-model="configureBackup.accessKeyId" id="inputConfigureBackupAccessKeyId" name="accessKeyId" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
                         </div>
 
-                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.secretAccessKey }" ng-show="configureBackup.provider === 's3'">
+                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.secretAccessKey }" ng-show="s3like(configureBackup.provider)">
                             <label class="control-label" for="inputConfigureBackupSecretAccessKey">Secret access key</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.secretAccessKey" id="inputConfigureBackupSecretAccessKey" name="secretAccessKey" ng-disabled="configureBackup.busy" ng-required="configureBackup.provider === 's3'">
+                            <input type="text" class="form-control" ng-model="configureBackup.secretAccessKey" id="inputConfigureBackupSecretAccessKey" name="secretAccessKey" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
                         </div>
 
-                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 's3'">
-                            <label class="control-label" for="inputConfigureBackupEndpoint">Endpoint (optional)</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL of S3 compatible storage (Minio, Swift). Leave empty when using Amazon S3.">
+                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 'minio'">
+                            <label class="control-label" for="inputConfigureBackupEndpoint">Endpoint</label>
+                            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL of Minio" ng-required="configureBackup.provider === 'minio'">
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.key }">
@@ -379,7 +379,7 @@
         </div>
         <div class="col-xs-6 text-right">
             <span ng-show="backupConfig.provider === 'filesystem'">{{ backupConfig.backupFolder || '/var/backups' }}</span>
-            <span ng-show="backupConfig.provider === 's3'">{{ backupConfig.region + '   ' + backupConfig.bucket + '/' + backupConfig.prefix }}</span>
+            <span ng-show="s3like(backupConfig.provider)">{{ backupConfig.region + '   ' + backupConfig.bucket + '/' + backupConfig.prefix }}</span>
         </div>
     </div>
 
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index 35dc22733..3bef28b09 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -52,7 +52,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
     $scope.storageProvider = [
         { name: 'Amazon S3', value: 's3' },
-        { name: 'Filesystem (not recommended)', value: 'filesystem' }
+        { name: 'Filesystem (not recommended)', value: 'filesystem' },
+        { name: 'Minio', value: 'minio' }
     ];
 
     $scope.planChange = {
@@ -333,6 +334,10 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         }
     };
 
+    $scope.s3like = function (provider) {
+        return provider === 's3' || provider === 'minio';
+    };
+
     $scope.configureBackup = {
         busy: false,
         error: {},
@@ -373,18 +378,23 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             };
 
             // only set provider specific fields, this will clear them in the db
-            if (backupConfig.provider === 's3') {
+            if ($scope.s3like(backupConfig.provider)) {
                 backupConfig.bucket = $scope.configureBackup.bucket;
                 backupConfig.prefix = $scope.configureBackup.prefix;
                 backupConfig.accessKeyId = $scope.configureBackup.accessKeyId;
                 backupConfig.secretAccessKey = $scope.configureBackup.secretAccessKey;
+
+                if (backupConfig.provider === 's3') {
+                    if ($scope.configureBackup.region) backupConfig.region = $scope.configureBackup.region;
+                } else if (backupConfig.provider === 'minio') {
+                    backupConfig.region = 'us-east-1';
+                }
+
+                if ($scope.configureBackup.endpoint) backupConfig.endpoint = $scope.configureBackup.endpoint;
             } else if (backupConfig.provider === 'filesystem') {
                 backupConfig.backupFolder = $scope.configureBackup.backupFolder;
             }
 
-            if ($scope.configureBackup.region) backupConfig.region = $scope.configureBackup.region;
-            if ($scope.configureBackup.endpoint) backupConfig.endpoint = $scope.configureBackup.endpoint;
-
             Client.setBackupConfig(backupConfig, function (error) {
                 $scope.configureBackup.busy = false;