diff --git a/build-base.php b/build-base.php
index 1abbe7642d..c6135a12c8 100644
--- a/build-base.php
+++ b/build-base.php
@@ -34,7 +34,7 @@ while (!feof($sql_fh)) {
         if (isset($_SESSION['offset']) && $limit < $_REQUEST['offset']) {
             continue;
         }
-        elseif ( abs($limit-$_REQUEST['offset']) > 6) {
+        elseif ( time()-$_SESSION['last'] > 45 ) {
             $_SESSION['offset'] = $limit;
             $GLOBALS['refresh'] = '<b>Installing, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
             return;
diff --git a/html/install.php b/html/install.php
index bec581e350..232a44c12b 100644
--- a/html/install.php
+++ b/html/install.php
@@ -317,6 +317,7 @@ elseif($stage == "2") {
     $config['db_name']=$dbname;
     $config['db']['extension']='mysqli';
     $sql_file = '../build.sql';
+    $_SESSION['last'] = time();
     ob_end_flush();
     ob_start();
     if ($_SESSION['offset'] < 100 && $_REQUEST['offset'] < 94) {
@@ -325,11 +326,11 @@ elseif($stage == "2") {
     else {
         require '../includes/sql-schema/update.php';
     }
-    $_SESSION['out'] .= ob_get_clean().PHP_EOL;
+    $_SESSION['out'] .= ob_get_clean();
     ob_end_clean();
     ob_start();
     echo $GLOBALS['refresh'];
-    echo "<pre>".$_SESSION['out']."</pre>";
+    echo "<pre>".trim($_SESSION['out'])."</pre>";
 ?>
      </div>
      <div class="col-md-3">
diff --git a/includes/sql-schema/update.php b/includes/sql-schema/update.php
index 837794abf2..3f3cab6619 100644
--- a/includes/sql-schema/update.php
+++ b/includes/sql-schema/update.php
@@ -91,19 +91,19 @@ if ($tmp[0] <= $db_rev) {
     return;
 }
 
-$limit = @$limit?: $_REQUEST['offset'];
+$limit = 150; //magic marker far enough in the future
 foreach ($filelist as $file) {
     list($filename,$extension) = explode('.', $file, 2);
     if ($filename > $db_rev) {
 
-    if (isset($_SESSION['stage']) ) {
-        $limit++;
-        if ( abs($limit-$_REQUEST['offset']) > 6) {
-            $_SESSION['offset'] = $limit;
-            $GLOBALS['refresh'] = '<b>Updating, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
-            return;
+        if (isset($_SESSION['stage']) ) {
+            $limit++;
+            if ( time()-$_SESSION['last'] > 45 ) {
+                $_SESSION['offset'] = $limit;
+                $GLOBALS['refresh'] = '<b>Updating, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
+                return;
+            }
         }
-    }
 
         if (!$updating) {
             echo "-- Updating database schema\n";