diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20e9513..c47e87d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [2.0.0](https://github.com/inaka/worker_pool/tree/2.0.0) (2016-05-26)
+[Full Changelog](https://github.com/inaka/worker_pool/compare/1.1.0...2.0.0)
+
+**Closed issues:**
+
+- Move from erlang.mk to rebar3 [\#60](https://github.com/inaka/worker_pool/issues/60)
+
+**Merged pull requests:**
+
+- \[Close \#60\] Euen.60.rebar3 [\#61](https://github.com/inaka/worker_pool/pull/61) ([Euen](https://github.com/Euen))
+
 ## [1.1.0](https://github.com/inaka/worker_pool/tree/1.1.0) (2016-04-28)
 [Full Changelog](https://github.com/inaka/worker_pool/compare/1.0.4...1.1.0)
 
@@ -12,11 +23,11 @@
 - Wrong typespec for strategy\(\) [\#48](https://github.com/inaka/worker_pool/issues/48)
 - Add wpool\_fsm\_process tests [\#46](https://github.com/inaka/worker_pool/issues/46)
 - Update README.md [\#45](https://github.com/inaka/worker_pool/issues/45)
-- Possibility to create anonymous pools? [\#32](https://github.com/inaka/worker_pool/issues/32)
 - gen\_fsm as workers [\#24](https://github.com/inaka/worker_pool/issues/24)
 - Update Dependencies [\#23](https://github.com/inaka/worker_pool/issues/23)
-- Worker recycling/expiration [\#20](https://github.com/inaka/worker_pool/issues/20)
 - ability to provide custom strategies [\#16](https://github.com/inaka/worker_pool/issues/16)
+- Possibility to create anonymous pools? [\#32](https://github.com/inaka/worker_pool/issues/32)
+- Worker recycling/expiration [\#20](https://github.com/inaka/worker_pool/issues/20)
 
 **Merged pull requests:**
 
@@ -24,12 +35,13 @@
 - Ferigis.46.adding fsm tests [\#54](https://github.com/inaka/worker_pool/pull/54) ([ferigis](https://github.com/ferigis))
 - Replacement for \#47 [\#53](https://github.com/inaka/worker_pool/pull/53) ([elbrujohalcon](https://github.com/elbrujohalcon))
 - handle custom strategy functions [\#52](https://github.com/inaka/worker_pool/pull/52) ([benoitc](https://github.com/benoitc))
-- Fail fast if there is no spare workers in the pool [\#51](https://github.com/inaka/worker_pool/pull/51) ([michalwski](https://github.com/michalwski))
 - Updated wpool stats/0 type specification [\#50](https://github.com/inaka/worker_pool/pull/50) ([akalyaev](https://github.com/akalyaev))
 - Fix the typespec for the hash\_worker strategy [\#49](https://github.com/inaka/worker_pool/pull/49) ([waisbrot](https://github.com/waisbrot))
 - updating README and creating a default fsm worker [\#47](https://github.com/inaka/worker_pool/pull/47) ([ferigis](https://github.com/ferigis))
-- Get the Project up to date regarding our internal rules [\#44](https://github.com/inaka/worker_pool/pull/44) ([igaray](https://github.com/igaray))
 - Ferigis.24.gen fsm as a workers [\#43](https://github.com/inaka/worker_pool/pull/43) ([ferigis](https://github.com/ferigis))
+- Version Bump to 1.1.0 [\#59](https://github.com/inaka/worker_pool/pull/59) ([elbrujohalcon](https://github.com/elbrujohalcon))
+- Fail fast if there is no spare workers in the pool [\#51](https://github.com/inaka/worker_pool/pull/51) ([michalwski](https://github.com/michalwski))
+- Get the Project up to date regarding our internal rules [\#44](https://github.com/inaka/worker_pool/pull/44) ([igaray](https://github.com/igaray))
 - Properly change the random implementation for R18 [\#27](https://github.com/inaka/worker_pool/pull/27) ([elbrujohalcon](https://github.com/elbrujohalcon))
 
 ## [1.0.4](https://github.com/inaka/worker_pool/tree/1.0.4) (2015-12-05)
diff --git a/README.md b/README.md
index 3f0b36c..28653ab 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ The goal of **worker pool** is pretty straightforward: To provide a transparent
 
 ### Documentation
 
-The documentation can be generated from code using [edoc](http://www.erlang.org/doc/apps/edoc/chapter.html) with ``make edoc`` or using [erldocs](https://github.com/erldocs/erldocs) with ``make erldocs``. It is also available online [here](http://inaka.github.io/worker_pool/)
+The documentation can be generated from code using [edoc](http://www.erlang.org/doc/apps/edoc/chapter.html) with ``rebar3 edoc`` or using [erldocs](https://github.com/erldocs/erldocs) with ``make erldocs``. It is also available online [here](http://inaka.github.io/worker_pool/)
 
 ### Usage
 
diff --git a/src/worker_pool.app.src b/src/worker_pool.app.src
index c0909f6..95cc2cf 100644
--- a/src/worker_pool.app.src
+++ b/src/worker_pool.app.src
@@ -17,7 +17,7 @@
 {application, worker_pool,
  [
   {description, "Erlang Worker Pool"},
-  {vsn, "1.1.0"},
+  {vsn, "2.0.0"},
   {id, "worker_pool"},
   {registered,   []},
   {modules, []},