diff --git a/.htaccess b/.htaccess
new file mode 100644
index 000000000..a82d55023
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,4 @@
+# At least on web servers supporting the .htaccess mecanism,
+# we disable session.auto_start; on other servers, users will
+# get a warning that they have to disable this setting
+php_flag session.auto_start 0
diff --git a/ChangeLog b/ChangeLog
index c4af9161d..3fe7b37bb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2006-02-05 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+2006-02-10 Marc Delisle  <lem9@users.sourceforge.net>
+    * .htaccess added to main directory for bug #1411996; at least on
+      servers supporting .htaccess we can run even if session.auto_start
+      is enabled
+
+2006-02-09 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libararies/session.inc.php:
       stop execution and ommit warning on session.auto_start enabled