diff --git a/app/main/controller/setup.php b/app/main/controller/setup.php
index b236b1fd..ecf4693b 100644
--- a/app/main/controller/setup.php
+++ b/app/main/controller/setup.php
@@ -540,6 +540,13 @@ class Setup extends Controller {
                 'check' => function_exists('exec') == $f3->get('REQUIREMENTS.PHP.EXEC'),
                 'tooltip' => 'exec() funktion. Check "disable_functions" in php.ini'
             ],
+            'memoryLimit' => [
+                'label' => 'memory_limit',
+                'required' => $f3->get('REQUIREMENTS.PHP.MEMORY_LIMIT'),
+                'version' => ini_get('memory_limit'),
+                'check' => ini_get('memory_limit') >= $f3->get('REQUIREMENTS.PHP.MEMORY_LIMIT'),
+                'tooltip' => 'PHP default = 64MB.'
+            ],
             'maxInputVars' => [
                 'label' => 'max_input_vars',
                 'required' => $f3->get('REQUIREMENTS.PHP.MAX_INPUT_VARS'),
diff --git a/app/requirements.ini b/app/requirements.ini
index db039493..fec3a4f0 100644
--- a/app/requirements.ini
+++ b/app/requirements.ini
@@ -36,6 +36,10 @@ EXEC                        = 1
 ; max execution time for requests (seconds)
 MAX_EXECUTION_TIME          =   10
 
+; max memory limit
+; some requests e.g. build indexes on /setup page require more RAM
+MEMORY_LIMIT                =   128M
+
 ; max variable size for $_GET, $_POST and $_COOKIE
 ; this is required for importing larger maps
 ; http://php.net/manual/en/info.configuration.php