diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27b862e18..984dd638c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
-# 0.6.0-dev
-
+# 0.6.0
+
+* Most of functions covered by specs and docs now
+* Removed JSON programming and poison dependency [@saulecabrera, @vforvova]
+* Add Faker.Shakespeare [@adam-wanninger]
+* Fix SSL issues in Internet.image_url/0 [@zmoshansky]
+* Improve tests [@lowks]
+* Elixir 1.1 support
 * Add Faker.App with author/0, name/0 and version/0
 * Add Faker.Address.country_code/0
 * Add Faker.Bitcoin with address/0 and address/1
diff --git a/README.md b/README.md
index 5e6b588ae..3b419e28c 100644
--- a/README.md
+++ b/README.md
@@ -35,103 +35,6 @@ want to use it in tests, just add `Faker.start` to `test/test_helper.exs`, and
 use any function decribed below. For example, if you nead random name use
 `Faker.Name.name`.
 
-## Generators / Providers
-
-* **Address**
-  * `building_number()`
-  * `city_prefix()`
-  * `city_suffix()`
-  * `city()`
-  * `country()`
-  * `country_code()`
-  * `latitude()`
-  * `longitude()`
-  * `postcode()`
-  * `secondary_address()`
-  * `state_abbr()`
-  * `state()`
-  * `street_address(secondary_address \\ false)`
-  * `street_name()`
-  * `street_suffix()`
-  * `time_zone()`
-  * `zip_code()`
-  * `zip()`
-* **App**
-  * `author()`
-  * `name()`
-  * `version()`
-* **Avatar**
-  * `image_url()`
-  * `image_url(slug)`
-  * `image_url(width, height)`
-  * `image_url(slug, width, height)`
-* **Code**
-  * `isbn()`
-  * `isbn10()`
-  * `isbn13()`
-  * `issn()`
-* **Commerce**
-  * `color()`
-  * `department()`
-  * `price()`
-  * `product_name()`
-  * `product_name_adjective()`
-  * `product_name_material()`
-  * `product_name_product()`
-* **Company**
-  * `bs()`
-  * `bullshit()`
-  * `bullshit_prefix()`
-  * `bullshit_suffix()`
-  * `buzzword()`
-  * `buzzword_prefix()`
-  * `buzzword_suffix()`
-  * `catch_phrase()`
-  * `name()`
-  * `suffix()`
-* **Internet**
-  * `domain_name()`
-  * `domain_suffix()`
-  * `domain_word()`
-  * `email()`
-  * `free_email()`
-  * `free_email_service()`
-  * `image_url()`
-  * `ip_v4_address()`
-  * `ip_v6_address()`
-  * `mac_address()`
-  * `safe_email()`
-  * `url()`
-  * `user_name()`
-* **Lorem**
-  * `characters(range \\ 15..255)`
-  * `characters(num)`
-  * `paragraph(range \\ 2..5)`
-  * `paragraph(num)`
-  * `paragraphs(range \\ 2..5)`
-  * `paragraphs(num)`
-  * `sentence(range \\ 4..10)`
-  * `sentence(num, mark)`
-  * `sentences(range \\ 2..5)`
-  * `sentences(num)`
-  * `word()`
-  * `sentences(range \\ 3..6)`
-  * `sentences(num)`
-* **Name**
-  * `first_name()`
-  * `last_name()`
-  * `name()`
-  * `prefix()`
-  * `suffix()`
-  * `title()`
-* **Team**
-  * `creature()`
-  * `name()`
-
-## Thanks
-
-[![Sponsored by Evil Martians](https://evilmartians.com/badges/sponsored-by-evil-martians.svg)](http://evilmartians.com/)
-
 ## TODO
 
 * Add more generators
@@ -160,6 +63,10 @@ other tools.
 
 You can build templates for testing purposes with the
 [Blacksmith](https://github.com/batate/blacksmith) project. See the Blacksmith
+
+## Thanks
+
+[![Sponsored by Evil Martians](https://evilmartians.com/badges/sponsored-by-evil-martians.svg)](http://evilmartians.com/)
 [readme](https://github.com/batate/blacksmith#readme) for details.
 
 # [License](https://github.com/igas/faker/blob/master/LICENSE)
diff --git a/mix.exs b/mix.exs
index 8e2f25ddb..e026e1c5e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Faker.Mixfile do
   def project do
     [
       app: :faker,
-      version: "0.6.0-dev",
+      version: "0.6.0",
       elixir: "~> 1.0",
       description: "Faker is a pure Elixir library for generating fake data.",
       package: package,
@@ -30,7 +30,7 @@ defmodule Faker.Mixfile do
 
   defp package do
     [
-      files: ["lib", "priv", "mix.exs", "mix.lock"],
+      files: ["lib", "mix.exs", "mix.lock"],
       contributors: ["Igor Kapkov"],
       licenses: ["MIT"],
       links: %{"GitHub" => "https://github.com/igas/faker"}