diff --git a/docs/NEWS b/docs/NEWS
index c13b7ce1..43fee6e0 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.4 ()
 ------------------------------------------------------------------------
 
+    * Add memory_limit output to s9y installation, 8MB for 32bit and
+      16MB for 64bit OSes
+
     * Add support for postgreSQL ts_vector fulltext search, thanks
       to genesis.
 
diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index fc93941f..a7aa0937 100644
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -343,6 +343,18 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
             }
      ?></td>
     </tr>
+    <tr>
+      <td>memory_limit</td>
+      <td width="150"><strong><?php echo (PHP_INT_SIZE == 4 ? '8M' : '16M'); ?></strong></td>
+      <td width="150"><?php
+            if ( serendipity_ini_bytesize(ini_get('memory_limit')) >= ((PHP_INT_SIZE == 4 ? 8 : 16)*1024*1024) ) {
+                echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, ini_get('memory_limit'));
+            } else {
+                echo serendipity_installerResultDiagnose(S9Y_I_WARNING, ini_get('memory_limit'));
+            }
+     ?></td>
+    </tr>
+
 </table>
 
 <br />
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 16d9bb33..6b141ad6 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -175,6 +175,7 @@ $serendipity['charsets'] = array(
  */
 if ( !defined('IN_installer') && IS_installed === false ) {
     header('Status: 302 Found');
+    header('X-RequireInstall: 1');
     header('Location: ' . (strtolower($_SERVER['HTTPS']) == 'on' ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])) . '/serendipity_admin.php');
     serendipity_die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
 }