diff --git a/ChangeLog b/ChangeLog
index d8980d257..f3f5153be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - [browse] Properly display NULL value for BLOB.
 - rfe #1516803 [edit] Allow to set BLOB to/from NULL with ProtectBinary.
 - [edit] Do not default to UNHEX when using file upload.
+- rfe #1379201 [core] Add option to configure session_save_path.
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/Documentation.html b/Documentation.html
index e03d163c9..6df9ca0b7 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1297,6 +1297,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         This setting is used while importing/exporting dump files and in the
         Synchronize feature but has no effect when PHP is running in safe mode.</dd>
 
+    <dt id="cfg_SessionSavePath">$cfg['SessionSavePath'] string</dt>
+    <dd>Path for storing session data (<a
+    href="http://php.net/session_save_path">session_save_path PHP parameter</a>).</dd>
+
     <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt>
     <dd>Set the number of bytes a script is allowed to allocate. If set
         to zero, no limit is imposed.<br />
diff --git a/libraries/config.default.php b/libraries/config.default.php
index ddb5c3a5d..03f031049 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -535,6 +535,13 @@ $cfg['ForceSSL'] = false;
  */
 $cfg['ExecTimeLimit'] = 300;
 
+/**
+ * Path for storing session data (session_save_path PHP parameter).
+ *
+ * @global integer $cfg['SessionSavePath']
+ */
+$cfg['SessionSavePath'] = '';
+
 /**
  * maximum allocated bytes (0 for no limit)
  *
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index c4b59271c..df2e13c4f 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -37,6 +37,12 @@ session_set_cookie_params(0, $GLOBALS['PMA_Config']->getCookiePath(),
 // cookies are safer (use @ini_set() in case this function is disabled)
 @ini_set('session.use_cookies', true);
 
+// optionally set session_save_path
+$path = $GLOBALS['PMA_Config']->get('SessionSavePath');
+if (!empty($path)) {
+    session_save_path($path);
+}
+
 // but not all user allow cookies
 @ini_set('session.use_only_cookies', false);
 @ini_set('session.use_trans_sid', true);