diff --git a/mix.exs b/mix.exs
index 97487b84c..fb9a31dbb 100644
--- a/mix.exs
+++ b/mix.exs
@@ -144,7 +144,7 @@ defmodule Ejabberd.MixProject do
      {:p1_utils, "~> 1.0"},
      {:pkix, "~> 1.0"},
      {:stringprep, ">= 1.0.26"},
-     {:xmpp, "~> 1.9.3"},
+     {:xmpp, git: "https://github.com/processone/xmpp", ref: "64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0", override: true},
      {:yconf, "~> 1.0.17"}]
     ++ cond_deps()
   end
diff --git a/mix.lock b/mix.lock
index 9842b9c91..8ce6a75c1 100644
--- a/mix.lock
+++ b/mix.lock
@@ -34,6 +34,6 @@
   "stringprep": {:hex, :stringprep, "1.0.30", "46cf0ff631b3e7328f61f20b454d59428d87738f25d709798b5dcbb9b83c23f1", [:rebar3], [{:p1_utils, "1.0.26", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "f6fc9b3384a03877830f89b2f38580caf3f4a27448a4a333d6a8c3975c220b9a"},
   "stun": {:hex, :stun, "1.2.15", "eec510af6509201ff97f1f2c87b7977c833bf29c04e985383370ec21f04e4ccf", [:rebar3], [{:fast_tls, "1.1.22", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.26", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "f6d8a541a29fd13f2ce658b676c0cc661262b96e045b52def1644b75ebc0edef"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
-  "xmpp": {:hex, :xmpp, "1.9.3", "fa4f9eda52d789f4b9f5ff11fed17da2c43fa8d01ed7c4fadcb09ab602be9c18", [:rebar3], [{:ezlib, "~> 1.0.12", [hex: :ezlib, repo: "hexpm", optional: false]}, {:fast_tls, "~> 1.1.19", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:fast_xml, "~> 1.1.51", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:idna, "~> 6.0", [hex: :idna, repo: "hexpm", optional: false]}, {:p1_utils, "~> 1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "~> 1.0.29", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm", "d5c96fcb2cf8a8da43a5f81935b2e43fa9b959e1626fcecf082f4af9139bdbd2"},
+  "xmpp": {:git, "https://github.com/processone/xmpp", "64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0", [ref: "64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0"]},
   "yconf": {:hex, :yconf, "1.0.17", "dcf242e27f3fc5d0743d6b8175dd39bc14a1f4ed7e6ea986366a44a6ff3b2a3a", [:rebar3], [{:fast_yaml, "1.0.37", [hex: :fast_yaml, repo: "hexpm", optional: false]}], "hexpm", "dd2892923241449a46cc8457b9ec0fb14030700735a5885955677c735c341a25"},
 }
diff --git a/rebar.config b/rebar.config
index bc6a258c5..0e0e3154f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -77,7 +77,7 @@
         {stringprep, "~> 1.0.29", {git, "https://github.com/processone/stringprep", {tag, "1.0.30"}}},
         {if_var_true, stun,
          {stun, "~> 1.2.12", {git, "https://github.com/processone/stun", {tag, "1.2.15"}}}},
-        {xmpp, "~> 1.9.2", {git, "https://github.com/processone/xmpp", {tag, "1.9.3"}}},
+        {xmpp, "~> 1.9.2", {git, "https://github.com/processone/xmpp", "64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0"}},
         {yconf, "~> 1.0.17", {git, "https://github.com/processone/yconf", {tag, "1.0.17"}}}
        ]}.
 
diff --git a/rebar.lock b/rebar.lock
index 7a9e810bf..e96263cb9 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -24,7 +24,10 @@
  {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.30">>},0},
  {<<"stun">>,{pkg,<<"stun">>,<<"1.2.15">>},0},
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},1},
- {<<"xmpp">>,{pkg,<<"xmpp">>,<<"1.9.3">>},0},
+ {<<"xmpp">>,
+  {git,"https://github.com/processone/xmpp",
+       {ref,"64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0"}},
+  0},
  {<<"yconf">>,{pkg,<<"yconf">>,<<"1.0.17">>},0}]}.
 [
 {pkg_hash,[
@@ -53,7 +56,6 @@
  {<<"stringprep">>, <<"46CF0FF631B3E7328F61F20B454D59428D87738F25D709798B5DCBB9B83C23F1">>},
  {<<"stun">>, <<"EEC510AF6509201FF97F1F2C87B7977C833BF29C04E985383370EC21F04E4CCF">>},
  {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>},
- {<<"xmpp">>, <<"FA4F9EDA52D789F4B9F5FF11FED17DA2C43FA8D01ED7C4FADCB09AB602BE9C18">>},
  {<<"yconf">>, <<"DCF242E27F3FC5D0743D6B8175DD39BC14A1F4ED7E6EA986366A44A6FF3B2A3A">>}]},
 {pkg_hash_ext,[
  {<<"base64url">>, <<"F9B3ADD4731A02A9B0410398B475B33E7566A695365237A6BDEE1BB447719F5C">>},
@@ -81,6 +83,5 @@
  {<<"stringprep">>, <<"F6FC9B3384A03877830F89B2F38580CAF3F4A27448A4A333D6A8C3975C220B9A">>},
  {<<"stun">>, <<"F6D8A541A29FD13F2CE658B676C0CC661262B96E045B52DEF1644B75EBC0EDEF">>},
  {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>},
- {<<"xmpp">>, <<"D5C96FCB2CF8A8DA43A5F81935B2E43FA9B959E1626FCECF082F4AF9139BDBD2">>},
  {<<"yconf">>, <<"DD2892923241449A46CC8457B9EC0FB14030700735A5885955677C735C341A25">>}]}
 ].