diff --git a/src/janitor.js b/src/janitor.js
index 9cf2d5f27..a0c596eca 100644
--- a/src/janitor.js
+++ b/src/janitor.js
@@ -115,16 +115,17 @@ function cleanupBackups(callback) {
     settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(error);
 
-        // nothing to do here
-        if (backupConfig.provider !== 'filesystem') return callback();
+        if (backupConfig.retentionSecs < 0) return callback();
 
         backups.getPaged(1, 1000, function (error, result) {
             if (error) return callback(error);
 
-            // sort with latest backups first in the array and slice 2
-            var toCleanup = result.sort(function (a, b) { return b.creationTime.getTime() - a.creationTime.getTime(); }).slice(2);
+            var now = new Date();
+            var toCleanup = result.filter(function (a) {
+                return (now - a.creationTime) > (backupConfig.retentionSecs * 1000);
+            });
 
-            debug('cleanupBackups: about to clean: ', toCleanup);
+            debug('cleanupBackups: about to clean: %j', toCleanup);
 
             async.each(toCleanup, function (backup, callback) {
                 backups.removeBackup(backup.id, backup.dependsOn, function (error) {
diff --git a/src/routes/settings.js b/src/routes/settings.js
index 25308cdfd..d5950fe3c 100644
--- a/src/routes/settings.js
+++ b/src/routes/settings.js
@@ -191,6 +191,7 @@ function setBackupConfig(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
     if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider is required'));
+    if (typeof req.body.retentionSecs !== 'number') return next(new HttpError(400, 'retentionSecs is required'));
     if ('key' in req.body && typeof req.body.key !== 'string') return next(new HttpError(400, 'key must be a string'));
 
     settings.setBackupConfig(req.body, function (error) {
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index d72c0c599..99523bbe3 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -191,6 +191,11 @@
                             <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">
+                            <label class="control-label" for="storageRetention">Retention Time</label>
+                            <select class="form-control" id="storageRetention" ng-model="configureBackup.retentionSecs" ng-options="a.value as a.name for a in retentionTimes"></select>
+                        </div>
+
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.key }">
                             <label class="control-label" for="inputConfigureBackupKey">Encryption key (optional)</label>
                             <input type="text" class="form-control" ng-model="configureBackup.key" id="inputConfigureBackupKey" name="prefix" ng-disabled="configureBackup.busy" placeholder="Passphrase used to encrypt the backups">
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index c8352bbf8..eced3e6ff 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -56,6 +56,13 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         { name: 'Minio', value: 'minio' }
     ];
 
+    $scope.retentionTimes = [
+        { name: '2 days', value: 2 * 24 * 60 * 60 },
+        { name: '1 week', value:  7 * 24 * 60 * 60},
+        { name: '1 month', value: 30 * 24 * 60 * 60},
+        { name: 'Forever', value: -1 }
+    ];
+
     $scope.planChange = {
         busy: false,
         error: {},
@@ -350,6 +357,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         region: '',
         endpoint: '',
         backupFolder: '',
+        retentionSecs: -1,
 
         clearForm: function () {
             $scope.configureBackup.bucket = '';
@@ -359,6 +367,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             $scope.configureBackup.endpoint = '';
             $scope.configureBackup.region = '';
             $scope.configureBackup.backupFolder = '';
+            $scope.configureBackup.retentionSecs = -1;
         },
 
         show: function () {
@@ -374,6 +383,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             $scope.configureBackup.endpoint = $scope.backupConfig.endpoint;
             $scope.configureBackup.key = $scope.backupConfig.key;
             $scope.configureBackup.backupFolder = $scope.backupConfig.backupFolder;
+            $scope.configureBackup.retentionSecs = $scope.backupConfig.retentionSecs;
 
             $('#configureBackupModal').modal('show');
         },