diff --git a/mix.exs b/mix.exs
index 627544bda..19ddbcbc2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -29,7 +29,7 @@ defmodule Ejabberd.Mixfile do
      included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab,
                              :fast_tls, :stringprep, :fast_xml, :xmpp,
                              :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
-                             :fs, :base64url, :jose]
+                             :eimp, :fs, :base64url, :jose]
                          ++ cond_apps()]
   end
 
@@ -74,6 +74,7 @@ defmodule Ejabberd.Mixfile do
      {:p1_oauth2, "~> 0.6.1"},
      {:distillery, "~> 1.0"},
      {:ex_doc, ">= 0.0.0", only: :dev},
+     {:eimp, github: "processone/eimp", ref: "c7201d18"},
      {:base64url, "~> 0.0.1"},
      {:jose, "~> 1.8"},
      {:fs, "~> 3.4"}]
@@ -97,8 +98,7 @@ defmodule Ejabberd.Mixfile do
                          {config(:pam), {:epam, "~> 1.0"}},
                          {config(:tools), {:luerl, github: "rvirding/luerl", tag: "v0.2"}},
                          {config(:tools), {:meck, "~> 0.8.4"}},
-                         {config(:tools), {:moka, github: "processone/moka", tag: "1.0.5c"}},
-                         {config(:graphics), {:eimp, github: "processone/eimp", tag: "1.0.1"}}], do:
+                         {config(:tools), {:moka, github: "processone/moka", tag: "1.0.5c"}}], do:
       dep
   end
 
@@ -108,8 +108,7 @@ defmodule Ejabberd.Mixfile do
                          {config(:pgsql), :p1_pgsql},
                          {config(:sqlite), :sqlite3},
                          {config(:zlib), :ezlib},
-                         {config(:iconv), :iconv},
-                         {config(:graphics), :eimp}], do:
+                         {config(:iconv), :iconv}], do:
       app
   end
 
diff --git a/mix.lock b/mix.lock
index 0c2c2bda5..d8502b50e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -2,7 +2,7 @@
   "cache_tab": {:hex, :cache_tab, "1.0.12", "a06a4ffbd4da8469791ba941512a6a45ed8c11865b4606a368e21b332da3638a", [:rebar3], [{:p1_utils, "1.0.10", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
   "distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
   "earmark": {:hex, :earmark, "1.2.4", "99b637c62a4d65a20a9fb674b8cffb8baa771c04605a80c911c4418c69b75439", [:mix], [], "hexpm"},
-  "eimp": {:git, "https://github.com/processone/eimp.git", "23796118176be98195db9f831f17dde74d1553e1", [tag: "1.0.1"]},
+  "eimp": {:git, "https://github.com/processone/eimp.git", "c7201d18c360b89faf2c827bf3ab2acc1c10b812", [ref: "c7201d18"]},
   "epam": {:hex, :epam, "1.0.3", "3adcc148cdbaaa2bbe15dd661f0d74284e5749a815b4e480dbf94e8e023361b9", [:rebar3], [], "hexpm"},
   "eredis": {:hex, :eredis, "1.1.0", "8d8d74496f35216679b97726b75fb1c8715e99dd7f3ef9f9824a2264c3e0aac0", [:rebar3], [], "hexpm"},
   "esip": {:hex, :esip, "1.0.21", "711c704337d434db6d7c70bd0da868aaacd91b252c0bb63b4580e6c896164f1f", [:rebar3], [{:fast_tls, "1.0.20", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.10", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.0.20", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm"},
diff --git a/rebar.config b/rebar.config
index 3bce1bf06..45fa07bee 100644
--- a/rebar.config
+++ b/rebar.config
@@ -32,7 +32,7 @@
         {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
         {jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.8.4"}}},
         {fs, ".*", {git, "https://github.com/synrc/fs", "bed9467"}},
-	{eimp, ".*", {git, "https://github.com/processone/eimp", "4ba6363"}},
+        {eimp, ".*", {git, "https://github.com/processone/eimp", "c7201d18"}},
         {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.20"}}}},
         {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.21"}}}},
         {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",