diff --git a/rebar.config b/rebar.config
index 83a51b399..b4ba34e46 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,9 +24,9 @@
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.1"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.16"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", "7fd02f3a2f"}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "63d467e"}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "b704d84"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}},
-	{yconf, ".*", {git, "https://github.com/processone/yconf", "f9c235faf828f52bb01881b172646960d5a8d523"}},
+	{yconf, ".*", {git, "https://github.com/processone/yconf", "99fb668"}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.5"}}},
         {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.2"}}},
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index a72117ac2..623080e30 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -22,8 +22,6 @@
 -module(ejabberd_c2s).
 -behaviour(xmpp_stream_in).
 -behaviour(ejabberd_listener).
--dialyzer([{no_fail_call, [stop/1, process_closed/2]},
-	   {no_return, process_closed/2}]).
 -protocol({rfc, 6121}).
 
 %% ejabberd_listener callbacks
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index ec65b7612..4b6f70ea5 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -22,8 +22,6 @@
 -module(ejabberd_s2s_in).
 -behaviour(xmpp_stream_in).
 -behaviour(ejabberd_listener).
--dialyzer([{no_fail_call, [stop/1, process_closed/2]},
-	   {no_return, process_closed/2}]).
 
 %% ejabberd_listener callbacks
 -export([start/3, start_link/3, accept/1, listen_options/0]).
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 5ee2a6dfb..074952df0 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -21,8 +21,6 @@
 %%%-------------------------------------------------------------------
 -module(ejabberd_s2s_out).
 -behaviour(xmpp_stream_out).
--dialyzer([{no_fail_call, [stop/1, process_closed/2, handle_timeout/1]},
-	   {no_return, [process_closed/2, handle_timeout/1]}]).
 
 %% xmpp_stream_out callbacks
 -export([tls_options/1, tls_required/1, tls_verify/1, tls_enabled/1,
diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
index b56d575f5..73b89af62 100644
--- a/src/mod_avatar.erl
+++ b/src/mod_avatar.erl
@@ -22,7 +22,6 @@
 %%%-------------------------------------------------------------------
 -module(mod_avatar).
 -behaviour(gen_mod).
--dialyzer({no_return, mod_opt_type/1}).
 -protocol({xep, 398, '0.2.0'}).
 
 %% gen_mod API
diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl
index 1111d0e8d..608bb5fb8 100644
--- a/src/mod_s2s_dialback.erl
+++ b/src/mod_s2s_dialback.erl
@@ -21,8 +21,6 @@
 %%%-------------------------------------------------------------------
 -module(mod_s2s_dialback).
 -behaviour(gen_mod).
--dialyzer([{no_fail_call, s2s_out_packet/2},
-	   {no_return, s2s_out_packet/2}]).
 -protocol({xep, 220, '1.1.1'}).
 -protocol({xep, 185, '1.0'}).