diff --git a/mix.exs b/mix.exs
index f9ce0400c..668773333 100644
--- a/mix.exs
+++ b/mix.exs
@@ -54,7 +54,7 @@ defmodule Ejabberd.Mixfile do
      {:p1_pgsql, "~> 1.0"},
      {:sqlite3, "~> 1.1"},
      {:p1_zlib, git: "https://github.com/processone/zlib", tag: "1.0.0"},
-     {:p1_iconv, git: "https://github.com/processone/eiconv", tag: "0.9.0"},
+     {:iconv, "~> 1.0"},
      {:eredis, "~> 1.0"},
      {:exrm, "~> 1.0.0-rc7", only: :dev}]
   end
diff --git a/rebar.config b/rebar.config
index 8e86e41ce..0d413d249 100644
--- a/rebar.config
+++ b/rebar.config
@@ -30,7 +30,7 @@
         {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}},
         %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
         {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
-        {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}},
+        {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv", {tag, "1.0.0"}}}},
         {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}},
         {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}.
 
@@ -49,7 +49,7 @@
                   p1_pgsql,
                   p1_pam,
                   p1_zlib,
-                  p1_iconv]}}.
+                  iconv]}}.
 
 {erl_opts, [nowarn_deprecated_function,
             {if_var_false, debug, no_debug_info},
@@ -101,7 +101,7 @@
                        {"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, iconv, {"p1_iconv", []}}]}.
+                       {if_var_true, iconv, {"iconv", []}}]}.
 
 {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
 
diff --git a/src/mod_irc.erl b/src/mod_irc.erl
index 183088956..25b3245de 100644
--- a/src/mod_irc.erl
+++ b/src/mod_irc.erl
@@ -116,7 +116,7 @@ stop(Host) ->
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
 init([Host, Opts]) ->
-    ejabberd:start_app(p1_iconv),
+    ejabberd:start_app(iconv),
     MyHost = gen_mod:get_opt_host(Host, Opts,
 				  <<"irc.@HOST@">>),
     case gen_mod:db_type(Host, Opts) of