diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl
index 51d5db9d8..af403645a 100644
--- a/src/cyrsasl_anonymous.erl
+++ b/src/cyrsasl_anonymous.erl
@@ -26,6 +26,8 @@
 
 -module(cyrsasl_anonymous).
 
+-protocol({xep, 175, '1.2'}).
+
 -export([start/1, stop/0, mech_new/4, mech_step/2]).
 
 -behaviour(cyrsasl).
diff --git a/src/ejabberd.erl b/src/ejabberd.erl
index 64ac5a0da..14404cd4c 100644
--- a/src/ejabberd.erl
+++ b/src/ejabberd.erl
@@ -26,6 +26,16 @@
 -module(ejabberd).
 -author('alexey@process-one.net').
 
+-protocol({xep, 4, '2.9'}).
+-protocol({xep, 86, '1.0'}).
+-protocol({xep, 106, '1.1'}).
+-protocol({xep, 170, '1.0'}).
+-protocol({xep, 205, '1.0'}).
+-protocol({xep, 212, '1.0'}).
+-protocol({xep, 216, '1.0'}).
+-protocol({xep, 243, '1.0'}).
+-protocol({xep, 270, '1.0'}).
+
 -export([start/0, stop/0, start_app/1, start_app/2,
 	 get_pid_file/0, check_app/1]).
 
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index d6729dd46..74831fffb 100644
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -25,6 +25,8 @@
 
 -module(ejabberd_s2s).
 
+-protocol({xep, 220, '1.1'}).
+
 -behaviour(ejabberd_config).
 
 -author('alexey@process-one.net').
diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl
index a69b731c5..b609da5bd 100644
--- a/src/ejabberd_stun.erl
+++ b/src/ejabberd_stun.erl
@@ -26,6 +26,7 @@
 -module(ejabberd_stun).
 
 -protocol({rfc, 5766}).
+-protocol({xep, 176, '1.0'}).
 
 -export([tcp_init/2, udp_init/2, udp_recv/5, start/2,
 	 socket_type/0]).
diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl
index 1287d5687..bb0d962ff 100644
--- a/src/mod_client_state.erl
+++ b/src/mod_client_state.erl
@@ -25,6 +25,7 @@
 
 -module(mod_client_state).
 -author('holger@zedat.fu-berlin.de').
+-protocol({xep, 85, '2.1'}).
 -protocol({xep, 352, '0.1'}).
 
 -behavior(gen_mod).
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index 4969ac187..f572c33d1 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -49,6 +49,7 @@
 -author('christophe.romain@process-one.net').
 -protocol({xep, 60, '1.13-1'}).
 -protocol({xep, 163, '1.2'}).
+-protocol({xep, 248, '0.2'}).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").