diff --git a/AUTHORS b/AUTHORS.md
similarity index 98%
rename from AUTHORS
rename to AUTHORS.md
index fdf494210c43b5ec58153c3340cafe4690c5bb00..8e4ae26ec37600d7033ffb74ebbe3bb359ef6fae 100644
--- a/AUTHORS
+++ b/AUTHORS.md
@@ -207,3 +207,5 @@ documentation and additional help.
 * Mathias Soupault <mathias.soupault@inalco.fr>
   Making supannAliasLogin usage possible in password recovery
 
+* Patzke Thomas <thomas.patzke2@thyssenkrupp.com>
+  Security and vulnerabitity testing
diff --git a/Changelog.md b/Changelog.md
index e01f667719386eedf23ef13658241d2bcc2e10bd..db4c73da8a0edfa2605acf90b1c040f0811dd1b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,45 @@
+## %"FusionDirectory 1.2.2" - 2018-08-16
+
+### Added
+
+#### fusiondirectory-plugins
+- fd-plugins#5821 Add LUKS section to FAI disk entry
+
+### Changed
+
+#### fusiondirectory-plugins
+- fd-plugins#5836 random_int should be used instead of mt_rand
+- fd-plugins#5840 Duplicated value in affiliation file
+
+### Fixed
+
+#### fusiondirectory
+- fd#5730 PHP error when I deactivate "opsi client" tab on a workstation
+- fd#5789 LDIF import can trigger PHP errors on empty file
+- fd#5816 Blacklist is not reset correctly for UserAttribute
+- fd#5824 LDIF generation does not respect STARTTLS setting
+- fd#5846 Samba groups are not showing in dashboard
+- fd#5850 Config insertion LDAP errors from setup are not shown
+- fd#5851 Creating a user from a template with a non-existing group crashes
+- fd#5864 Name field for countries should be limited to two characters
+- fd#5868 HTML is not escaped in departments descriptions
+
+#### fusiondirectory-plugins
+- fd-plugins#5719 Locale issues in the fai plugin
+- fd-plugins#5741 Reference tab on the OPSI profile is not showing objects reference
+- fd-plugins#5810 WebService should not return session cookie
+- fd-plugins#5827 Fatal error in opsiProfile when OPSI server is not found in the LDAP
+- fd-plugins#5828 supannCodeEntite should allow uppercase as well
+- fd-plugins#5832 Copy/pasting of Samba groups fails
+- fd-plugins#5833 Error in supann tab when we use a template
+
+### Security
+
+#### fusiondirectory
+- fd#5840 Security Vulnerability: Cross Site Request Forgery
+- fd#5842 Security: Missing Security Headers
+- fd#5843 Security: Insecure Generation of Random Tokens
+
 ## %"FusionDirectory 1.2.1" - 2018-05-09
 
 ### Added
diff --git a/UPGRADE.md b/UPGRADE.md
index 525a228adba83b888f89800aebe55c9afd509b6e..d4b3f96273cac7c1cb81ab42d21f0abdc0768a4f 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -2786,11 +2786,12 @@ apt-get remove fusiondirectory-plugin-kolab2-schema
 
 ### Upgrade schema2ldif
 
+
 For Jessie distribution add extra repository
 
 ```shell
 # fusiondirectory debian-extra repository
-deb http://repos.fusiondirectory.org/debian-extra jessie main
+deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-jessie/ jessie main
 ```
 
   * Update the package list and upgrade schema2ldif
@@ -2946,6 +2947,7 @@ Check that all you index still match with valid attributes present in your ldap
 
 Open and save it back so it will use the new format
 
+
 ## Migrate FusionDirectory from 1.1 to 1.1.1
 
 ### New Depot Configuration
@@ -2958,7 +2960,7 @@ For Jessie distribution add extra repository
 
 ```shell
 # fusiondirectory debian-extra repository
-deb http://repos.fusiondirectory.org/debian-extra jessie main
+deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-jessie/ jessie main
 ```
 
 * Update the package list and upgrade schema2ldif
@@ -2990,7 +2992,14 @@ For Jessie distribution add extra repository
 
 ```shell
 # fusiondirectory debian-extra repository
-deb http://repos.fusiondirectory.org/debian-extra jessie main
+deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-jessie/ jessie main
+```
+
+For Stretch distribution add extra repository
+
+```shell
+# fusiondirectory debian-extra repository
+deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-stretch/ stretch main
 ```
 
 * Update the package list and upgrade schema2ldif
@@ -3037,7 +3046,65 @@ fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/sympa-fd.schem
 
 * In case you use system template that have a DNS tab, you need to remake it because the separator "|" is changed to "^"
 
+
+## Migrate FusionDirectory from 1.2 to 1.2.1
+
+### Upgrade schema2ldif
+
+For Jessie distribution add extra repository
+
+```shell
+# fusiondirectory debian-extra repository
+deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-jessie/ jessie main
+```
+
+For Stretch distribution add extra repository
+
+```shell
+# fusiondirectory debian-extra repository
+deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-stretch/ stretch main
+```
+
+
+* Update the package list and upgrade schema2ldif
+
+```shell
+apt-get update
+apt-get install schema2ldif
+```
+
+### Upgrade FusionDirectory first
+
+  * Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
+
+```shell
+apt-get install fusiondirectory
+```
+
+  * Upgrade FusionDirectory schema package too.
+
+```shell
+apt-get install fusiondirectory-schema
+```
+
 [php-cas]: http://packages.ubuntu.com/trusty/all/php-cas/download
 
 [repo-urls]: https://documentation.fusiondirectory.org/en/dl_install
 
+---
+* Further information
+
+To improve this piece of software, please report all kind of errors using the bug tracker
+on https://forge.fusiondirectory.org
+
+Documentation: https://documentation.fusiondirectory.org/
+Mailinglist:   https://lists.fusiondirectory.org/
+Irc:           #fusiondirectory on freenode
+
+---
+The FusionDirectory project https://www.fusiondirectory.org/
+
+
+
+Enjoy :)
+