diff --git a/ChangeLog b/ChangeLog
index 7eb289c50..5e11f270b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-07  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Pub/sub implementation (not
+	completed yet)
+
+2003-07-05  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/jlib.hrl: Added pub/sub nemaspaces
+
 2003-07-03  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/mod_irc/iconv_erl.c (iconv_erl_control): Bugfix
diff --git a/src/ejabberd.cfg b/src/ejabberd.cfg
index e4a954acc..57dc4bc00 100644
--- a/src/ejabberd.cfg
+++ b/src/ejabberd.cfg
@@ -40,8 +40,8 @@
 
 {listen, [{5522, ejabberd_c2s,     start, [{access, c2s},
 					   {shaper, c2s_shaper}]},
-	  %{5523, ejabberd_c2s,     start,
-	  % [{access, c2s}, {ssl, [{certfile, "./ssl.pem"}]}]},
+	  {5523, ejabberd_c2s,     start,
+	   [{access, c2s}, {ssl, [{certfile, "./ssl.pem"}]}]},
           {5269, ejabberd_s2s_in,  start, []},
           {8888, ejabberd_service, start,
 	   [{host, "conference.e.localhost", [{password, "asdqwe"}]}]}
@@ -62,6 +62,7 @@
            {mod_private,   []},
            {mod_irc,       []},
            {mod_muc,       []},
+           {mod_pubsub,    []},
            {mod_time,      [{iqdisc, no_queue}]},
            {mod_version,   []}
           ]}.
diff --git a/src/jlib.hrl b/src/jlib.hrl
index 55f365409..cc3d33136 100644
--- a/src/jlib.hrl
+++ b/src/jlib.hrl
@@ -5,35 +5,38 @@
 %%% Created :  5 Mar 2003 by Alexey Shchepin <alexey@sevcom.net>
 %%%----------------------------------------------------------------------
 
--define(NS_DISCO_ITEMS, "http://jabber.org/protocol/disco#items").
--define(NS_DISCO_INFO,  "http://jabber.org/protocol/disco#info").
--define(NS_VCARD,       "vcard-temp").
--define(NS_AUTH,        "jabber:iq:auth").
--define(NS_AUTH_ERROR,  "jabber:iq:auth:error").
--define(NS_REGISTER,    "jabber:iq:register").
--define(NS_SEARCH,      "jabber:iq:search").
--define(NS_ROSTER,      "jabber:iq:roster").
--define(NS_PRIVATE,     "jabber:iq:private").
--define(NS_VERSION,     "jabber:iq:version").
--define(NS_TIME,        "jabber:iq:time").
--define(NS_XDATA,       "jabber:x:data").
--define(NS_IQDATA,      "jabber:iq:data").
--define(NS_DELAY,       "jabber:x:delay").
--define(NS_EVENT,       "jabber:x:event").
--define(NS_XCONFERENCE, "jabber:x:conference").
--define(NS_STATS,       "http://jabber.org/protocol/stats").
--define(NS_MUC,         "http://jabber.org/protocol/muc").
--define(NS_MUC_USER,    "http://jabber.org/protocol/muc#user").
--define(NS_MUC_ADMIN,   "http://jabber.org/protocol/muc#admin").
--define(NS_MUC_OWNER,   "http://jabber.org/protocol/muc#owner").
+-define(NS_DISCO_ITEMS,  "http://jabber.org/protocol/disco#items").
+-define(NS_DISCO_INFO,   "http://jabber.org/protocol/disco#info").
+-define(NS_VCARD,        "vcard-temp").
+-define(NS_AUTH,         "jabber:iq:auth").
+-define(NS_AUTH_ERROR,   "jabber:iq:auth:error").
+-define(NS_REGISTER,     "jabber:iq:register").
+-define(NS_SEARCH,       "jabber:iq:search").
+-define(NS_ROSTER,       "jabber:iq:roster").
+-define(NS_PRIVATE,      "jabber:iq:private").
+-define(NS_VERSION,      "jabber:iq:version").
+-define(NS_TIME,         "jabber:iq:time").
+-define(NS_XDATA,        "jabber:x:data").
+-define(NS_IQDATA,       "jabber:iq:data").
+-define(NS_DELAY,        "jabber:x:delay").
+-define(NS_EVENT,        "jabber:x:event").
+-define(NS_XCONFERENCE,  "jabber:x:conference").
+-define(NS_STATS,        "http://jabber.org/protocol/stats").
+-define(NS_MUC,          "http://jabber.org/protocol/muc").
+-define(NS_MUC_USER,     "http://jabber.org/protocol/muc#user").
+-define(NS_MUC_ADMIN,    "http://jabber.org/protocol/muc#admin").
+-define(NS_MUC_OWNER,    "http://jabber.org/protocol/muc#owner").
+-define(NS_PUBSUB,       "http://jabber.org/protocol/pubsub").
+-define(NS_PUBSUB_EVENT, "http://jabber.org/protocol/pubsub#event").
+-define(NS_PUBSUB_OWNER, "http://jabber.org/protocol/pubsub#owner").
 
--define(NS_STREAM,      "http://etherx.jabber.org/streams").
+-define(NS_STREAM,       "http://etherx.jabber.org/streams").
 
--define(NS_STANZAS,     "urn:ietf:params:xml:ns:xmpp-stanzas").
--define(NS_STREAMS,     "urn:ietf:params:xml:ns:xmpp-streams").
+-define(NS_STANZAS,      "urn:ietf:params:xml:ns:xmpp-stanzas").
+-define(NS_STREAMS,      "urn:ietf:params:xml:ns:xmpp-streams").
 
--define(NS_SASL, "urn:ietf:params:xml:ns:xmpp-sasl").
--define(NS_SESSION, "urn:ietf:params:xml:ns:xmpp-session").
+-define(NS_SASL,         "urn:ietf:params:xml:ns:xmpp-sasl").
+-define(NS_SESSION,      "urn:ietf:params:xml:ns:xmpp-session").
 
 % TODO: remove "code" attribute (currently it used for backward-compatibility)
 -define(STANZA_ERROR(Code, Type, Condition),
@@ -44,7 +47,7 @@
 -define(ERR_BAD_REQUEST,
 	?STANZA_ERROR("400", "modify",    "bad-request")).
 -define(ERR_CONFLICT,
-	?STANZA_ERROR("409", "cancel",    "cancel")).
+	?STANZA_ERROR("409", "cancel",    "conflict")).
 -define(ERR_FEATURE_NOT_IMPLEMENTED,
 	?STANZA_ERROR("501", "cancel",    "feature-not-implemented")).
 -define(ERR_FORBIDDEN,
@@ -70,9 +73,9 @@
 -define(ERR_SERVICE_UNAVAILABLE,
 	?STANZA_ERROR("503", "cancel",    "service-unavailable")).
 -define(ERR_SUBSCRIPTION_REQUIRED,
-	?STANZA_ERROR("0", "auth", "subscription-required")).
+	?STANZA_ERROR("0",   "auth",      "subscription-required")).
 -define(ERR_UNEXPECTED_REQUEST,
-	?STANZA_ERROR("0", "wait", "unexpected-request")).
+	?STANZA_ERROR("0",   "wait",      "unexpected-request")).
 %-define(ERR_,
 %	?STANZA_ERROR("", "", "")).