diff --git a/.gitignore b/.gitignore
index 851f964..ce57d68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ glpi-0.72.4-11497.tar.gz
 /glpi-9.1.5-c7dc27d.tar.gz
 /glpi-9.1.6-2683ce0.tar.gz
 /glpi-9.2-43bade1.tar.gz
+/glpi-9.2.1-3a7c596.tar.gz
diff --git a/glpi-9.1-config_path.php b/glpi-9.1-config_path.php
deleted file mode 100644
index 37a3cd8..0000000
--- a/glpi-9.1-config_path.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// for Redhat/Fedora RPM defaults
-
-// Config
-define('GLPI_CONFIG_DIR',     '/etc/glpi');
-
-// Runtime Data
-define('GLPI_DOC_DIR',        '/var/lib/glpi/files');
-define('GLPI_CRON_DIR',       GLPI_DOC_DIR . '/_cron');
-define('GLPI_DUMP_DIR',       GLPI_DOC_DIR . '/_dumps');
-define('GLPI_GRAPH_DIR',      GLPI_DOC_DIR . '/_graphs');
-define('GLPI_LOCK_DIR',       GLPI_DOC_DIR . '/_lock');
-define('GLPI_PICTURE_DIR',    GLPI_DOC_DIR . '/_pictures');
-define('GLPI_PLUGIN_DOC_DIR', GLPI_DOC_DIR . '/_plugins');
-define('GLPI_RSS_DIR',        GLPI_DOC_DIR . '/_rss');
-define('GLPI_SESSION_DIR',    GLPI_DOC_DIR . '/_sessions');
-define('GLPI_TMP_DIR',        GLPI_DOC_DIR . '/_tmp');
-define('GLPI_UPLOAD_DIR',     GLPI_DOC_DIR . '/_uploads');
-
-// Log
-define('GLPI_LOG_DIR',        '/var/log/glpi');
-
-// System libraries
-define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
-
-// Fonts
-define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
-
-//Use system cron
-define('GLPI_SYSTEM_CRON', true);
diff --git a/glpi-9.1-config_path_test.php b/glpi-9.1-config_path_test.php
deleted file mode 100644
index 05c24f2..0000000
--- a/glpi-9.1-config_path_test.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// for Redhat/Fedora RPM buiding test suite
-
-// Runtime Data
-define('GLPI_DOC_DIR',        __DIR__ . '/../files');
-define('GLPI_CRON_DIR',       GLPI_DOC_DIR . '/_cron');
-define('GLPI_DUMP_DIR',       GLPI_DOC_DIR . '/_dumps');
-define('GLPI_GRAPH_DIR',      GLPI_DOC_DIR . '/_graphs');
-define('GLPI_LOCK_DIR',       GLPI_DOC_DIR . '/_lock');
-define('GLPI_PICTURE_DIR',    GLPI_DOC_DIR . '/_pictures');
-define('GLPI_PLUGIN_DOC_DIR', GLPI_DOC_DIR . '/_plugins');
-define('GLPI_RSS_DIR',        GLPI_DOC_DIR . '/_rss');
-define('GLPI_SESSION_DIR',    GLPI_DOC_DIR . '/_sessions');
-define('GLPI_TMP_DIR',        GLPI_DOC_DIR . '/_tmp');
-define('GLPI_UPLOAD_DIR',     GLPI_DOC_DIR . '/_uploads');
-
-// System libraries
-define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
-
-// Fonts
-define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
-
-//Use system cron
-define('GLPI_SYSTEM_CRON', true);
diff --git a/glpi-9.2-config_path.php b/glpi-9.2-config_path.php
new file mode 100644
index 0000000..5c0e672
--- /dev/null
+++ b/glpi-9.2-config_path.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Red Hat / Fedora RPM default configuration
+ *
+ * Modifying this file in-place is not recommended, because
+ * changes will be overwritten during package upgrades.
+ *
+ * If you want to customize the behaviour, the best way is to
+ * create and use the /etc/glpi/local_define.php file.
+ *
+**/
+
+
+// Config
+define('GLPI_CONFIG_DIR',     '/etc/glpi');
+
+// Runtime Data
+defined('GLPI_VAR_DIR')        or define('GLPI_VAR_DIR',        '/var/lib/glpi/files');
+defined('GLPI_DOC_DIR')        or define('GLPI_DOC_DIR',        GLPI_VAR_DIR);
+defined('GLPI_CRON_DIR')       or define('GLPI_CRON_DIR',       GLPI_VAR_DIR . '/_cron');
+defined('GLPI_DUMP_DIR')       or define('GLPI_DUMP_DIR',       GLPI_VAR_DIR . '/_dumps');
+defined('GLPI_GRAPH_DIR')      or define('GLPI_GRAPH_DIR',      GLPI_VAR_DIR . '/_graphs');
+defined('GLPI_LOCK_DIR')       or define('GLPI_LOCK_DIR',       GLPI_VAR_DIR . '/_lock');
+defined('GLPI_PICTURE_DIR')    or define('GLPI_PICTURE_DIR',    GLPI_VAR_DIR . '/_pictures');
+defined('GLPI_PLUGIN_DOC_DIR') or define('GLPI_PLUGIN_DOC_DIR', GLPI_VAR_DIR . '/_plugins');
+defined('GLPI_RSS_DIR')        or define('GLPI_RSS_DIR',        GLPI_VAR_DIR . '/_rss');
+defined('GLPI_SESSION_DIR')    or define('GLPI_SESSION_DIR',    GLPI_VAR_DIR . '/_sessions');
+defined('GLPI_TMP_DIR')        or define('GLPI_TMP_DIR',        GLPI_VAR_DIR . '/_tmp');
+defined('GLPI_UPLOAD_DIR')     or define('GLPI_UPLOAD_DIR',     GLPI_VAR_DIR . '/_uploads');
+defined('GLPI_CACHE_DIR')      or define('GLPI_CACHE_DIR',      GLPI_VAR_DIR . '/_cache');
+
+// Log
+defined('GLPI_LOG_DIR')        or define('GLPI_LOG_DIR',        '/var/log/glpi');
+
+// System libraries
+define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
+
+// Fonts
+define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
+
+// Use system cron
+define('GLPI_SYSTEM_CRON', true);
+
+// Packaging
+define('GLPI_INSTALL_MODE', 'RPM');
diff --git a/glpi-9.2-config_path_test.php b/glpi-9.2-config_path_test.php
new file mode 100644
index 0000000..05c24f2
--- /dev/null
+++ b/glpi-9.2-config_path_test.php
@@ -0,0 +1,24 @@
+<?php
+// for Redhat/Fedora RPM buiding test suite
+
+// Runtime Data
+define('GLPI_DOC_DIR',        __DIR__ . '/../files');
+define('GLPI_CRON_DIR',       GLPI_DOC_DIR . '/_cron');
+define('GLPI_DUMP_DIR',       GLPI_DOC_DIR . '/_dumps');
+define('GLPI_GRAPH_DIR',      GLPI_DOC_DIR . '/_graphs');
+define('GLPI_LOCK_DIR',       GLPI_DOC_DIR . '/_lock');
+define('GLPI_PICTURE_DIR',    GLPI_DOC_DIR . '/_pictures');
+define('GLPI_PLUGIN_DOC_DIR', GLPI_DOC_DIR . '/_plugins');
+define('GLPI_RSS_DIR',        GLPI_DOC_DIR . '/_rss');
+define('GLPI_SESSION_DIR',    GLPI_DOC_DIR . '/_sessions');
+define('GLPI_TMP_DIR',        GLPI_DOC_DIR . '/_tmp');
+define('GLPI_UPLOAD_DIR',     GLPI_DOC_DIR . '/_uploads');
+
+// System libraries
+define('GLPI_HTMLAWED',       '/usr/share/php/htmLawed/htmLawed.php');
+
+// Fonts
+define('GLPI_FONT_FREESANS',  '/usr/share/fonts/gnu-free/FreeSans.ttf');
+
+//Use system cron
+define('GLPI_SYSTEM_CRON', true);
diff --git a/glpi-fedora-autoloader.php b/glpi-fedora-autoloader.php
index a9ea4fa..808881d 100644
--- a/glpi-fedora-autoloader.php
+++ b/glpi-fedora-autoloader.php
@@ -16,6 +16,7 @@ require_once $vendor . '/php-simplepie/autoloader.php';
 require_once $vendor . '/tcpdf/autoload.php';
 //        "zendframework/zend-cache": "^2.7",
 //        "zendframework/zend-i18n": "^2.7",
+//        "zendframework/zend-serializer": "^2.7",
 require_once $vendor . '/Zend/autoload.php';
 //        "michelf/php-markdown": "^1.6",
 require_once $vendor . '/Michelf/markdown-autoload.php';
diff --git a/glpi-localdef.patch b/glpi-localdef.patch
new file mode 100644
index 0000000..7b7be8d
--- /dev/null
+++ b/glpi-localdef.patch
@@ -0,0 +1,16 @@
+diff -up ./inc/based_config.php.rpm ./inc/based_config.php
+--- ./inc/based_config.php.rpm	2017-10-11 09:59:42.446010854 +0200
++++ ./inc/based_config.php	2017-10-11 10:11:47.457934585 +0200
+@@ -46,9 +46,9 @@ if (!empty($tz)) {
+    date_default_timezone_set(@date_default_timezone_get());
+ }
+ 
+-// If this file exists, it is load
+-if (file_exists(GLPI_ROOT. '/config/local_define.php')) {
+-   require_once GLPI_ROOT. '/config/local_define.php';
++// If this file exists, it is load from etc (RPM specific)
++if (file_exists('/etc/glpi/local_define.php')) {
++   require_once '/etc/glpi/local_define.php';
+ }
+ 
+ // If this file exists, it is load, allow to set configdir/dumpdir elsewhere
diff --git a/glpi.spec b/glpi.spec
index 0233ab1..f8a6799 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 
-%global gh_commit  43bade1249719184b83a197fb57167676f68aae5
+%global gh_commit  3a7c5969c0534d0b5bf27fef9c4d96f56147ae66
 %global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date    20160923
 %global gh_owner   glpi-project
@@ -35,8 +35,8 @@
 %global with_tests  0%{!?_without_tests:1}
 
 Name:           %{gh_project}
-Version:        9.2
-Release:        1%{?dist}
+Version:        9.2.1
+Release:        2%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -47,14 +47,17 @@ URL:            http://www.glpi-project.org/
 Source0:        https://github.com/%{gh_owner}/%{name}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz
 
 Source1:        %{name}-httpd.conf
-Source2:        %{name}-9.1-config_path.php
-Source12:       %{name}-9.1-config_path_test.php
+Source2:        %{name}-9.2-config_path.php
+Source12:       %{name}-9.2-config_path_test.php
 Source3:        %{name}-logrotate
 Source4:        %{name}-nginx.conf
 Source5:        %{name}-fedora-autoloader.php
 # Temporary minify script, waiting for consolidation/robo
 Source6:        %{name}-minify.php
 
+# RPM patch to use /etc/glpi/local_define.php
+Patch1:         glpi-localdef.patch
+
 BuildArch:      noarch
 BuildRequires:  gettext
 %if %{with_tests}
@@ -81,6 +84,8 @@ BuildRequires:  php-composer(zendframework/zend-cache)  <  3
 BuildRequires:  php-composer(zendframework/zend-cache)  >= 2.7
 BuildRequires:  php-composer(zendframework/zend-i18n)   <  3
 BuildRequires:  php-composer(zendframework/zend-i18n)   >= 2.7
+BuildRequires:  php-composer(zendframework/zend-serializer) <  3
+BuildRequires:  php-composer(zendframework/zend-serializer) >= 2.7
 BuildRequires:  php-composer(michelf/php-markdown)      <  2
 BuildRequires:  php-composer(michelf/php-markdown)      >= 1.6
 BuildRequires:  php-composer(true/punycode)             <  3
@@ -149,6 +154,8 @@ Requires:       php-composer(zendframework/zend-cache)  <  3
 Requires:       php-composer(zendframework/zend-cache)  >= 2.7
 Requires:       php-composer(zendframework/zend-i18n)   <  3
 Requires:       php-composer(zendframework/zend-i18n)   >= 2.7
+Requires:       php-composer(zendframework/zend-serializer) <  3
+Requires:       php-composer(zendframework/zend-serializer) >= 2.7
 Requires:       php-composer(zendframework/zend-loader)
 Requires:       php-composer(michelf/php-markdown)      <  2
 Requires:       php-composer(michelf/php-markdown)      >= 1.6
@@ -206,6 +213,7 @@ techniciens grâce à une maintenance plus cohérente.
 
 %prep
 %setup -q -n %{name}-%{gh_commit}
+%patch1 -p1
 
 grep %{version} inc/define.php
 
@@ -226,7 +234,7 @@ ln -s /usr/share/fonts/fontawesome/fontawesome-webfont.ttf lib/font-awesome-4.7.
 : bundled JS libraries
 ls lib
 
-cp  %{SOURCE2}  config/config_path.php
+cp  %{SOURCE2}  inc/downstream.php
 cp  %{SOURCE6}  tools/minify.php
 
 mkdir vendor
@@ -289,10 +297,9 @@ install -Dpm 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/nginx/default.d/glpi.co
 %endif
 
 # ===== config =====
-cp -ar config %{buildroot}/%{_datadir}/%{name}/config
-
 mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
 touch %{buildroot}%{_sysconfdir}/%{name}/config_db.php
+touch %{buildroot}%{_sysconfdir}/%{name}/local_define.php
 
 # ===== files =====
 mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}
@@ -315,7 +322,6 @@ rm -f %{buildroot}%{_localstatedir}/lib/%{name}/files/.htaccess
 # Proctection in /etc/httpd/conf.d/glpi.conf
 rm -f %{buildroot}%{_datadir}/%{name}/install/mysql/.htaccess
 rm -f %{buildroot}%{_datadir}/%{name}/locales/.htaccess
-rm -f %{buildroot}%{_datadir}/%{name}/config/.htaccess
 rm -f %{buildroot}%{_datadir}/%{name}/scripts/.htaccess
 
 
@@ -383,14 +389,13 @@ while [ $n -gt 0 ]; do
 done
 
 : Set tests configuration
-cp %{SOURCE12} config/config_path.php
+cp %{SOURCE12} inc/downstream.php
 
 : Run upstream test suite
 php tools/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_GB || RET=1
 
-#atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/database || RET=1
 atoum  --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/units || RET=1
-atoum  --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/api || RET=1
+atoum  --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/web   || RET=1
 
 : Cleanup
 if [ -s $MYSQL_PID_FILE ]; then
@@ -444,6 +449,7 @@ fi
 
 %attr(2770,root,apache) %dir %{_sysconfdir}/%{name}
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/config_db.php
+%ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/local_define.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/glpi.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
@@ -461,7 +467,6 @@ fi
 # License file required by installation process
 %{_datadir}/%{name}/COPYING.txt
 %{_datadir}/%{name}/ajax
-%{_datadir}/%{name}/config
 %{_datadir}/%{name}/css
 %{_datadir}/%{name}/front
 %{_datadir}/%{name}/inc
@@ -478,6 +483,10 @@ fi
 
 
 %changelog
+* Thu Nov 16 2017 Remi Collet <remi@remirepo.net> - 9.2.1-2
+- update to 9.2.1
+- add dependency on zendframework/zend-serializer
+
 * Thu Sep 28 2017 Remi Collet <remi@remirepo.net> - 9.2-1
 - update to 9.2
 - drop dependency on zetacomponents/graph
diff --git a/sources b/sources
index 3011c76..0036529 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glpi-9.2-43bade1.tar.gz) = 3e6b32f1469dd46306e7c201c1f1ca7c4045dfd260c12a870cd2b4f8288488b75f6cd19bd7ea9bbc7d3b3c699062ba6b37d64b984626d1c6939df45044ed0a8c
+SHA512 (glpi-9.2.1-3a7c596.tar.gz) = 0e49b9f965019131b881b264a3f4ddd896aad26d21f1cedb66accf8605f8a89e8285ebe2e3b3a0880321b0b3300a2905144c8cc0dec7fa7b460e64a450d71b41