diff --git a/CHANGELOG b/CHANGELOG
index a33825c..b597e1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@ Revision history for Lufi
 	- Add CSRF token challenge on logout
 	- Add constraints on mail sending to prevent spam sending (not perfect, but
 	should be good enough)
+	- Add Code of Conduct
 
 0.02.2 2017-09-18
 	- Fix cron tasks bug
diff --git a/README.md b/README.md
index 82c6348..17fd374 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## What does Lufi mean?
 
-Lufi means Let's Upload that FIle.
+Lufi means Let's Upload that FIle. It's a E2E encrypted file sharing software.
 
 ## Which browsers are compatible?
 
@@ -62,9 +62,9 @@ There is the web interface, but you can use a CLI client too! Have a look at <ht
 
 ## Internationalization
 
-Lufi comes with English and French languages. It will choose the language to display from the browser's settings.
+Lufi comes with several languages.
 
-If you want to add a language, merge-requests are welcome.
+Please, see [this wiki page](https://framagit.org/fiat-tux/hat-softwares/lufi/wikis/contribute#internationalization) to know how to contribute to internationalization.
 
 ## Authors
 
@@ -76,6 +76,8 @@ Please consider contributing, either by [reporting issues](https://framagit.org/
 
 The details on how to contribute are on the [wiki](https://framagit.org/luc/lufi/wikis/contribute).
 
+This software uses [Fiat Tux Code of conduct](https://framagit.org/fiat-tux/code-of-conduct/blob/master/README.md).
+
 ## Make a donation
 
 You can make a donation to the author on [Tipeee](https://www.tipeee.com/fiat-tux) or on [Liberapay](https://liberapay.com/sky/).