diff --git a/mix.exs b/mix.exs
index 0164649e7..51787e744 100644
--- a/mix.exs
+++ b/mix.exs
@@ -26,7 +26,7 @@ defmodule Ejabberd.Mixfile do
      applications: [:ssl],
      included_applications: [:lager, :mnesia, :p1_utils, :cache_tab,
                              :p1_tls, :stringprep, :p1_xml,
-                             :stun, :yaml, :p1_zlib, :iconv,
+                             :stun, :yaml, :ezlib, :iconv,
                              :esip, :jiffy, :oauth2, :xmlrpc, :eredis,
                              :p1_mysql, :p1_pgsql, :sqlite3]]
   end
@@ -53,7 +53,7 @@ defmodule Ejabberd.Mixfile do
      {:p1_mysql, "~> 1.0"},
      {:p1_pgsql, "~> 1.0"},
      {:sqlite3, "~> 1.1"},
-     {:p1_zlib, git: "https://github.com/processone/zlib", tag: "1.0.0"},
+     {:ezlib, "~> 1.0"},
      {:iconv, "~> 1.0"},
      {:eredis, "~> 1.0"},
      {:exrm, "~> 1.0.0-rc7", only: :dev}]
diff --git a/mix.lock b/mix.lock
index 4f88c5f22..a91a94c59 100644
--- a/mix.lock
+++ b/mix.lock
@@ -2,24 +2,25 @@
   "cache_tab": {:hex, :cache_tab, "1.0.2"},
   "eredis": {:hex, :eredis, "1.0.8"},
   "erlware_commons": {:hex, :erlware_commons, "0.15.0"},
-  "esip": {:git, "https://github.com/processone/p1_sip", "3bcccd4dfe705cb90f205887f749b1c5195fcad1", [tag: "1.0.1"]},
+  "esip": {:hex, :esip, "1.0.2"},
   "exrm": {:hex, :exrm, "1.0.0-rc7"},
+  "ezlib": {:hex, :ezlib, "1.0.1"},
+  "fast_tls": {:hex, :fast_tls, "1.0.1"},
   "fast_yaml": {:hex, :fast_yaml, "1.0.2"},
   "getopt": {:hex, :getopt, "0.8.2"},
   "goldrush": {:hex, :goldrush, "0.1.7"},
+  "iconv": {:hex, :iconv, "1.0.0"},
   "jiffy": {:hex, :jiffy, "0.14.7"},
   "lager": {:hex, :lager, "3.0.2"},
-  "p1_iconv": {:git, "https://github.com/processone/eiconv", "9751f86baa5a60ed1420490793e7514a0757462a", [tag: "0.9.0"]},
-  "p1_mysql": {:git, "https://github.com/processone/mysql", "064948ad3c77e582d85cbc09ccd11016ae97de0e", [tag: "1.0.0"]},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.1"},
   "p1_oauth2": {:hex, :p1_oauth2, "0.6.1"},
-  "p1_pgsql": {:git, "https://github.com/processone/pgsql", "248b6903cad82c748dc7f5be75e014dd8d47a3d1", [tag: "1.0.0"]},
-  "p1_stun": {:git, "https://github.com/processone/stun", "c3dc4d9ae6dbab311cc3ed1c116be71d17c6c771", [tag: "0.9.1"]},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.0.1"},
   "p1_tls": {:git, "https://github.com/processone/tls", "f19e1f701e0a3980ffc70b3917c4aa85e68d8520", [tag: "1.0.0"]},
   "p1_utils": {:hex, :p1_utils, "1.0.3"},
   "p1_xml": {:git, "https://github.com/processone/xml", "79c6d54e56bf991f1ec70ceb5e255afcb8dbf53f", [tag: "1.1.2"]},
   "p1_xmlrpc": {:hex, :p1_xmlrpc, "1.15.1"},
-  "p1_zlib": {:git, "https://github.com/processone/zlib", "e1f928e61553cf85638eaac7d024c8f68ce0ff36", [tag: "1.0.0"]},
   "providers": {:hex, :providers, "1.4.1"},
   "relx": {:hex, :relx, "3.5.0"},
   "sqlite3": {:hex, :sqlite3, "1.1.5"},
-  "stringprep": {:hex, :stringprep, "1.0.2"}}
+  "stringprep": {:hex, :stringprep, "1.0.2"},
+  "stun": {:hex, :stun, "1.0.1"}}
diff --git a/rebar.config b/rebar.config
index ef89077f5..f0559f5ee 100644
--- a/rebar.config
+++ b/rebar.config
@@ -13,8 +13,8 @@
         {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.2"}}},
         {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.2"}}},
-        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.0"}}},
-        {esip, ".*", {git, "https://github.com/processone/esip", "1.0.1"}},
+        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.1"}}},
+        {esip, ".*", {git, "https://github.com/processone/esip", "1.0.2"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.2"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2.git", {tag, "0.6.1"}}},
@@ -24,7 +24,7 @@
         {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {tag, "1.0.1"}}}},
         {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", {tag, "1.1.5"}}}},
         {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}},
-        {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}},
+        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib", {tag, "1.0.1"}}}},
         {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}},  % for riak_pb-2.1.0.7
         {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
         {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}},
@@ -48,7 +48,7 @@
                   p1_mysql,
                   p1_pgsql,
                   p1_pam,
-                  p1_zlib,
+                  ezlib,
                   iconv]}}.
 
 {erl_opts, [nowarn_deprecated_function,
@@ -100,7 +100,7 @@
                        {"esip", []},
                        {"p1_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
                        {if_var_true, pam, {"p1_pam", []}},
-                       {if_var_true, zlib, {"p1_zlib", []}},
+                       {if_var_true, zlib, {"ezlib", []}},
                        {if_var_true, iconv, {"iconv", []}}]}.
 
 {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 5589c31b9..78d67f2d6 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -256,7 +256,7 @@ start_apps() ->
     ejabberd:start_app(p1_tls),
     ejabberd:start_app(p1_xml),
     ejabberd:start_app(stringprep),
-    ejabberd:start_app(p1_zlib),
+    ejabberd:start_app(ezlib),
     ejabberd:start_app(cache_tab).
 
 opt_type(net_ticktime) ->