diff --git a/ChangeLog b/ChangeLog
index 777ffda7a..531fb70e9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-11-18 Marc Delisle  <lem9@users.sourceforge.net>
+    * lang/*: strUpgradeMySQL -> strUpgrade with one more parameter
+      for the product name
+    * main.php: new warnings for old PHP or MySQL versions
+
 2003-11-18 Michal Cihar  <nijel@users.sourceforge.net>
     * libraries/display_tbl.lib.php: Can kill more proceses (bug #844353).
 
diff --git a/main.php b/main.php
index 7fb22ed0f..3b63ef0bc 100644
--- a/main.php
+++ b/main.php
@@ -637,6 +637,22 @@ if (PMA_PHP_INT_VERSION == 40203 && @extension_loaded('mbstring')) {
     echo '<p class="warning">' . $strPHP40203 . '</p>' . "\n";
 }
 
+/**
+ * Warning for old PHP version
+ */
+
+if (PMA_PHP_INT_VERSION < 40100) {
+    echo '<p class="warning">' . sprintf($strUpgrade, 'PHP', '4.1.x') . '</p>' . "\n";
+}
+
+/**
+ * Warning for old MySQL version
+ */
+
+if (PMA_MYSQL_INT_VERSION < 32336) {
+    echo '<p class="warning">' . sprintf($strUpgrade, 'MySQL', '3.23.36') . '</p>' . "\n";
+}
+
 /**
  * Displays the footer
  */