diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl
index deef51c57..1805a16e0 100644
--- a/src/cyrsasl_scram.erl
+++ b/src/cyrsasl_scram.erl
@@ -27,6 +27,8 @@
 
 -author('stephen.roettger@googlemail.com').
 
+-protocol({rfc, 5802}).
+
 -export([start/1, stop/0, mech_new/4, mech_step/2]).
 
 -include("ejabberd.hrl").
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 5cdb8e1c9..cd77ace29 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -27,6 +27,10 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 78, '2.5'}).
+-protocol({xep, 138, '2.0'}).
+-protocol({xep, 198, '1.3'}).
+
 -update_info({update, 0}).
 
 -define(GEN_FSM, p1_fsm).
diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
index 110da1f69..fc9f975f5 100644
--- a/src/ejabberd_captcha.erl
+++ b/src/ejabberd_captcha.erl
@@ -25,6 +25,8 @@
 
 -module(ejabberd_captcha).
 
+-protocol({xep, 158, '1.0'}).
+
 -behaviour(gen_server).
 
 %% API
diff --git a/src/ejabberd_http_bind.erl b/src/ejabberd_http_bind.erl
index 234ccf35a..620c8f1d3 100644
--- a/src/ejabberd_http_bind.erl
+++ b/src/ejabberd_http_bind.erl
@@ -10,6 +10,9 @@
 
 -module(ejabberd_http_bind).
 
+-protocol({xep, 124, '1.11'}).
+-protocol({xep, 206, '1.4'}).
+
 -behaviour(gen_fsm).
 
 %% External exports
diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
index 641db497b..61e6595e3 100644
--- a/src/ejabberd_piefxis.erl
+++ b/src/ejabberd_piefxis.erl
@@ -38,6 +38,8 @@
 
 -module(ejabberd_piefxis).
 
+-protocol({xep, 227, '1.0'}).
+
 %% API
 -export([import_file/1, export_server/1, export_host/2]).
 
diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
index 1fbc18ff2..b7cea0c36 100644
--- a/src/ejabberd_service.erl
+++ b/src/ejabberd_service.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 114, '1.6'}).
+
 -define(GEN_FSM, p1_fsm).
 
 -behaviour(?GEN_FSM).
diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl
index 11347d604..9435f7e63 100644
--- a/src/ejabberd_stun.erl
+++ b/src/ejabberd_stun.erl
@@ -25,6 +25,8 @@
 %%%-------------------------------------------------------------------
 -module(ejabberd_stun).
 
+-protocol({rfc, 5766}).
+
 %% API
 -export([tcp_init/2, udp_init/2, udp_recv/5, start/2, socket_type/0]).
 
diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl
index 9d5f32c33..c45d157bb 100644
--- a/src/ejabberd_websocket.erl
+++ b/src/ejabberd_websocket.erl
@@ -38,6 +38,8 @@
 
 -module(ejabberd_websocket).
 
+-protocol({rfc, 6455}).
+
 -author('ecestari@process-one.net').
 
 -export([check/2, socket_handoff/8]).
diff --git a/src/jlib.erl b/src/jlib.erl
index 5b51f4f3f..389783b24 100644
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@ -27,6 +27,10 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 59, '1.0'}).
+-protocol({xep, 82, '1.1'}).
+-protocol({xep, 203, '2.0'}).
+
 -compile({no_auto_import, [atom_to_binary/2,
                            binary_to_integer/1,
                            integer_to_binary/1]}).
diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl
index ec41e73f5..db73ced54 100644
--- a/src/mod_adhoc.erl
+++ b/src/mod_adhoc.erl
@@ -27,6 +27,8 @@
 
 -author('henoch@dtek.chalmers.se').
 
+-protocol({xep, 50, '1.2'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_local_iq/3,
diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl
index 172786810..1d3bf3c34 100644
--- a/src/mod_blocking.erl
+++ b/src/mod_blocking.erl
@@ -28,6 +28,8 @@
 
 -behaviour(gen_mod).
 
+-protocol({xep, 191, '1.2'}).
+
 -export([start/2, stop/1, process_iq/3,
 	 process_iq_set/4, process_iq_get/5]).
 
diff --git a/src/mod_caps.erl b/src/mod_caps.erl
index 36c8c0eed..10fe29431 100644
--- a/src/mod_caps.erl
+++ b/src/mod_caps.erl
@@ -29,6 +29,8 @@
 
 -author('henoch@dtek.chalmers.se').
 
+-protocol({xep, 115, '1.5'}).
+
 -behaviour(gen_server).
 
 -behaviour(gen_mod).
diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl
index 24c09bffd..be9e30f9c 100644
--- a/src/mod_carboncopy.erl
+++ b/src/mod_carboncopy.erl
@@ -26,6 +26,7 @@
 %%%----------------------------------------------------------------------
 -module (mod_carboncopy).
 -author ('ecestari@process-one.net').
+-protocol({xep, 280, '0.8'}).
 
 -behavior(gen_mod).
 
diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl
index fd72c02f6..c5041ed04 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, 352, '0.1'}).
 
 -behavior(gen_mod).
 
diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 9e6e83e1c..f8ae1258d 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -23,13 +23,12 @@
 %%%
 %%%----------------------------------------------------------------------
 
-%%% Implements most of XEP-0133: Service Administration Version 1.1
-%%% (2005-08-19)
-
 -module(mod_configure).
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 133, '1.1'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, get_local_identity/5,
diff --git a/src/mod_disco.erl b/src/mod_disco.erl
index 00b65d23e..c0ab9a9ac 100644
--- a/src/mod_disco.erl
+++ b/src/mod_disco.erl
@@ -27,6 +27,9 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 30, '2.4'}).
+-protocol({xep, 157, '1.0'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_local_iq_items/3,
diff --git a/src/mod_last.erl b/src/mod_last.erl
index e079a2d38..4e96526e7 100644
--- a/src/mod_last.erl
+++ b/src/mod_last.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 12, '2.0'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_local_iq/3, export/1,
diff --git a/src/mod_muc.erl b/src/mod_muc.erl
index a3a8a9331..4fdc0fe13 100644
--- a/src/mod_muc.erl
+++ b/src/mod_muc.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 45, '1.25'}).
+
 -behaviour(gen_server).
 
 -behaviour(gen_mod).
diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl
index 8a1960088..b6699d103 100644
--- a/src/mod_multicast.erl
+++ b/src/mod_multicast.erl
@@ -9,6 +9,8 @@
 
 -author('badlop@process-one.net').
 
+-protocol({xep, 33, '1.1'}).
+
 -behaviour(gen_server).
 
 -behaviour(gen_mod).
diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 7f9a81a0d..7c18a7f98 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -26,6 +26,11 @@
 -module(mod_offline).
 
 -author('alexey@process-one.net').
+
+-protocol({xep, 22, '1.4'}).
+-protocol({xep, 23, '1.3'}).
+-protocol({xep, 160, '1.0'}).
+
 -define(GEN_SERVER, p1_server).
 -behaviour(?GEN_SERVER).
 
diff --git a/src/mod_ping.erl b/src/mod_ping.erl
index f493dccb8..9ba9833ee 100644
--- a/src/mod_ping.erl
+++ b/src/mod_ping.erl
@@ -27,6 +27,8 @@
 
 -author('bjc@kublai.com').
 
+-protocol({xep, 199, '2.0'}).
+
 -behavior(gen_mod).
 
 -behavior(gen_server).
diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
index fd3f60247..35c3ed93b 100644
--- a/src/mod_privacy.erl
+++ b/src/mod_privacy.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 16, '1.6'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_iq/3, export/1, import/1,
diff --git a/src/mod_private.erl b/src/mod_private.erl
index f09c6100e..09182ded6 100644
--- a/src/mod_private.erl
+++ b/src/mod_private.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 49, '1.2'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_sm_iq/3, import/3,
diff --git a/src/mod_proxy65.erl b/src/mod_proxy65.erl
index 6eced10b8..effe2f784 100644
--- a/src/mod_proxy65.erl
+++ b/src/mod_proxy65.erl
@@ -27,6 +27,8 @@
 
 -author('xram@jabber.ru').
 
+-protocol({xep, 65, '1.8'}).
+
 -behaviour(gen_mod).
 
 -behaviour(supervisor).
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index 8553db4e0..a61defc33 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -47,7 +47,8 @@
 -behaviour(gen_mod).
 -behaviour(gen_server).
 -author('christophe.romain@process-one.net').
--version('1.13-1').
+-protocol({xep, 60, '1.13-1'}).
+-protocol({xep, 163, '1.2'}).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
diff --git a/src/mod_register.erl b/src/mod_register.erl
index 1c03fb3e9..6cb6731c1 100644
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 77, '2.4'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, stream_feature_register/2,
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 605e8e367..aa214b421 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -34,6 +34,9 @@
 
 -module(mod_roster).
 
+-protocol({xep, 237, '1.3'}).
+-protocol({xep, 321, '0.1'}).
+
 -author('alexey@process-one.net').
 
 -behaviour(gen_mod).
diff --git a/src/mod_sic.erl b/src/mod_sic.erl
index ed44f8500..273930ff0 100644
--- a/src/mod_sic.erl
+++ b/src/mod_sic.erl
@@ -25,6 +25,8 @@
 
 -module(mod_sic).
 
+-protocol({xep, 279, '0.2'}).
+
 -author('karim.gemayel@process-one.net').
 
 -behaviour(gen_mod).
diff --git a/src/mod_sip.erl b/src/mod_sip.erl
index f7f2b8ed0..8790cdfc0 100644
--- a/src/mod_sip.erl
+++ b/src/mod_sip.erl
@@ -24,6 +24,7 @@
 
 %%%-------------------------------------------------------------------
 -module(mod_sip).
+-protocol({rfc, 3261}).
 
 -behaviour(gen_mod).
 -behaviour(esip).
diff --git a/src/mod_stats.erl b/src/mod_stats.erl
index 4317e9e92..4896a3c18 100644
--- a/src/mod_stats.erl
+++ b/src/mod_stats.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 39, '0.6.0'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_local_iq/3]).
diff --git a/src/mod_time.erl b/src/mod_time.erl
index 417ee6bb0..111428070 100644
--- a/src/mod_time.erl
+++ b/src/mod_time.erl
@@ -28,6 +28,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 202, '2.0'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_local_iq/3]).
diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
index ba23d0688..2c700af2f 100644
--- a/src/mod_vcard.erl
+++ b/src/mod_vcard.erl
@@ -27,6 +27,9 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 54, '1.2'}).
+-protocol({xep, 55, '1.3'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, init/3, stop/1, get_sm_features/5,
diff --git a/src/mod_version.erl b/src/mod_version.erl
index e46262a2a..669a401d4 100644
--- a/src/mod_version.erl
+++ b/src/mod_version.erl
@@ -27,6 +27,8 @@
 
 -author('alexey@process-one.net').
 
+-protocol({xep, 92, '1.1'}).
+
 -behaviour(gen_mod).
 
 -export([start/2, stop/1, process_local_iq/3]).