diff --git a/LICENSE.md b/LICENSE.md
index 5cf8fc853..3deb50991 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -14,36 +14,39 @@ Copyright (C) 2015 La Casemate
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-FabManager uses some external components, which are licenced under the
-terms of [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0):
+Fab-Manager uses some external components, which are licenced under the
+terms of the following licences:
 
-- [jasny-bootstrap](https://github.com/jasny/bootstrap/)
-- [elasticsearch](https://github.com/elasticsearch/bower-elasticsearch-js)
-- [nvd3](https://github.com/novus/nvd3)
-- [angular-bootstrap-switch](https://github.com/frapontillo/angular-bootstrap-switch)
-- [elasticsearch-rails](https://github.com/elastic/elasticsearch-rails)
-- [elasticsearch-model](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model)
-- [elasticsearch-persistence](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-persistence)
-- font [Open Sans](http://www.fontsquirrel.com/fonts/open-sans)
+- [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0):
+  - [jasny-bootstrap](https://github.com/jasny/bootstrap/)
+  - [elasticsearch](https://github.com/elasticsearch/bower-elasticsearch-js)
+  - [nvd3](https://github.com/novus/nvd3)
+  - [angular-bootstrap-switch](https://github.com/frapontillo/angular-bootstrap-switch)
+  - [elasticsearch-rails](https://github.com/elastic/elasticsearch-rails)
+  - [elasticsearch-model](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model)
+  - [elasticsearch-persistence](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-persistence)
+  - font [Open Sans](http://www.fontsquirrel.com/fonts/open-sans)
 
+- [General Public License version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.en.html):
+  - [railroady](https://github.com/preston/railroady)
+  - [unicorn](https://github.com/defunkt/unicorn)
+  - [prawn](https://github.com/prawnpdf/prawn)
+  - [prawn-table](https://github.com/prawnpdf/prawn-table)
 
-Some other used libraries/components are licenced under the terms of the
-[General Public License version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.en.html):
+- [BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause)
+  - [ruby](https://www.ruby-lang.org)
+  - [rubyzip](https://github.com/rubyzip/rubyzip)
+  - [byebug](https://github.com/deivid-rodriguez/byebug)
 
-- [ruby](https://www.ruby-lang.org)
-- [railroady](https://github.com/preston/railroady)
-- [unicorn](https://github.com/defunkt/unicorn)
-- [prawn](https://github.com/prawnpdf/prawn)
-- [prawn-table](https://github.com/prawnpdf/prawn-table)
+- [MIT Licence](https://opensource.org/licenses/MIT)
+  - Errors and omissions excepted, all the other external libraries used 
+    in this project.
 
-
-Errors and omissions excepted, the other external libraries used in this
-project are licenced under the terms of the [MIT Licence](https://opensource.org/licenses/MIT).
 Please refer to the libraries documentation for more information about
 their licences.
 
 Complete lists of used libraries are available in `bower.json` for the
-EcmaScript libraries and in `Gemfile` for Ruby libraries.
+JS/EcmaScript libraries and in `Gemfile` for Ruby libraries.