diff --git a/ChangeLog b/ChangeLog
index 0b56f64394..b3ccf7b113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
 - bug #3921 Call to undefined function PMA_isSuperuser() if default server is
 not set 
 - bug #3971 Ctrl/shift + click opens links in same window
+- bug #3964 Import using https does not work
 
 4.0.3.0 (2013-06-05)
 - bug #3941 Recent tables list always empty
diff --git a/doc/faq.rst b/doc/faq.rst
index 17e44b167e..c77f428661 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -796,7 +796,9 @@ has to be enabled in your PHP.
 If using APC, you must set ``apc.rfc1867`` to ``on`` in your :file:`php.ini`.
 
 If using PHP 5.4.0 or higher, you must set
-``session.upload_progress.enabled`` to ``1`` in your :file:`php.ini`.
+``session.upload_progress.enabled`` to ``1`` in your :file:`php.ini`. However,
+starting from phpMyAdmin version 4.0.4, session-based upload progress has
+been temporarily deactivated due to its problematic behavior. 
 
 .. seealso:: :rfc:`1867`
 
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
index e747d418da..f8e917343b 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -31,7 +31,8 @@ $upload_id = uniqid("");
   * and own file with functions in upload_#KEY#.php
   */
 $plugins = array(
-   "session",
+   // PHP 5.4 session-based upload progress is problematic, see bug 3964
+   //"session",
    "progress",
    "apc",
    "noplugin"