diff --git a/CHANGELOG.md b/CHANGELOG.md
index d47b9a904..59957d279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## next release
 
 - Fix a bug: missing translation after payment in english and portuguese
+- Updated puma for compatibility with openSSL > 1.0 
+- Documented installation on ArchLinux
 
 ## v2.5.10 2017 August 16
 
diff --git a/Gemfile b/Gemfile
index 94257d0e0..5686d6664 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ group :development do
   gem 'mailcatcher'
   gem 'awesome_print'
 
-  gem "puma"
+  gem 'puma'
   gem 'foreman'
 
   gem 'capistrano'
diff --git a/Gemfile.lock b/Gemfile.lock
index f992737be..e611da0fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -301,8 +301,7 @@ GEM
     prawn-table (0.2.1)
     protected_attributes (1.1.3)
       activemodel (>= 4.0.1, < 5.0)
-    puma (2.11.1)
-      rack (>= 1.1, < 2.0)
+    puma (3.10.0)
     pundit (1.0.0)
       activesupport (>= 3.0.0)
     rack (1.6.8)
@@ -568,4 +567,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.3
+   1.15.4
diff --git a/README.md b/README.md
index cbd6a1f8b..ae1a09838 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ In you only intend to run fab-manager on your local machine for testing purposes
 
 1. Install RVM with the ruby version specified in the [.ruby-version file](.ruby-version).
    For more details about the process, Please read the [official RVM documentation](http://rvm.io/rvm/install).
+   If you're using ArchLinux, you may have to [read this](doc/archlinux_readme.md) before. 
 
 2. Retrieve the project from Git
 
diff --git a/doc/archlinux_readme.md b/doc/archlinux_readme.md
new file mode 100644
index 000000000..33a3098a1
--- /dev/null
+++ b/doc/archlinux_readme.md
@@ -0,0 +1,13 @@
+# Specific instructions concerning installation on ArchLinux
+
+## Ruby 2.3.0
+Ruby 2.3.0 has a known issue with openSSL version > 1.0 (which is ArchLinux default). 
+To overpass this problem, you must install ruby with special indication of the openSSL installation to use.
+
+```bash
+sudo pacman -S gcc5
+rvm pkg install openssl
+CC=gcc-5 rvm install 2.3.0 -C --with-openssl-dir=$HOME/.rvm/usr
+```
+
+There's also an issue with openSSL and `puma` but this is fixed by using puma version > 3.
\ No newline at end of file