diff --git a/bootstrap/container.php b/bootstrap/container.php
index 8ed3cab..209981a 100644
--- a/bootstrap/container.php
+++ b/bootstrap/container.php
@@ -54,6 +54,7 @@ return [
                         'secret' => $config['storage']['secret'],
                     ],
                     'region' => $config['storage']['region'],
+                    'endpoint'  => $config['storage']['endpoint'],
                     'version' => 'latest',
                     '@http' => ['stream' => true],
                 ]);
diff --git a/install/index.php b/install/index.php
index f25cb28..662693e 100644
--- a/install/index.php
+++ b/install/index.php
@@ -134,6 +134,7 @@ $app->post('/', function (Request $request, Response $response, \DI\Container $c
                 $config['storage']['key'] = param($request, 'storage_key');
                 $config['storage']['secret'] = param($request, 'storage_secret');
                 $config['storage']['region'] = param($request, 'storage_region');
+                $config['storage']['endpoint'] = param($request, 'storage_endpoint');
                 $config['storage']['bucket'] = param($request, 'storage_bucket');
                 $config['storage']['path'] = param($request, 'storage_path');
                 break;
diff --git a/install/templates/install.twig b/install/templates/install.twig
index 0db4754..5d0e5f1 100644
--- a/install/templates/install.twig
+++ b/install/templates/install.twig
@@ -71,7 +71,7 @@
                                     <select id="storage_driver" name="storage_driver" class="form-control" required>
                                         <option value="local">Local Storage</option>
                                         <option value="ftp">FTP/FTPS</option>
-                                        <option value="s3">Amazon AWS S3</option>
+                                        <option value="s3">Amazon S3 (or compatible)</option>
                                         <option value="google-cloud">Google Cloud Storage</option>
                                         <option value="dropbox">Dropbox</option>
                                     </select>
@@ -101,6 +101,12 @@
                                     <input type="text" class="form-control hook-storage-input" id="storage_region" name="storage_region" placeholder="your-region" autocomplete="off">
                                 </div>
                             </div>
+                            <div class="form-group row hook-storage">
+                                <label for="storage_region" class="col-sm-3 col-form-label">AWS S3 endpoint</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control hook-storage-input" id="storage_endpoint" name="storage_endpoint" placeholder="optional (for S3-compliant services)" autocomplete="off">
+                                </div>
+                            </div>
                             <div class="form-group row hook-storage">
                                 <label for="storage_token" class="col-sm-3 col-form-label">Dropbox token</label>
                                 <div class="col-sm-9">
diff --git a/src/js/installer.js b/src/js/installer.js
index 4c4b474..305a15b 100644
--- a/src/js/installer.js
+++ b/src/js/installer.js
@@ -44,6 +44,7 @@ $(document).ready(function () {
                 $('#storage_key').prop('required', 'required').parent().parent().show();
                 $('#storage_secret').prop('required', 'required').parent().parent().show();
                 $('#storage_region').prop('required', 'required').parent().parent().show();
+                $("#storage_endpoint").prop('required', 'required').parent().parent().show();
                 $('#storage_bucket').prop('required', 'required').parent().parent().show();
                 break;
             case 'google-cloud':