diff --git a/ChangeLog b/ChangeLog
index 81f3032..c1772a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+nenolod     2007/05/24 04:02:33 UTC	(20070524-3472)
+  Log:
+  - update config files
+  
+
+  Changes:	Modified:
+  +1 -0		trunk/doc/example.conf (File Modified) 
+  +2 -0		trunk/doc/reference.conf (File Modified) 
+
+
 nenolod     2007/05/24 04:01:12 UTC	(20070524-3470)
   Log:
   - fold in whois_notice_global functionality.
diff --git a/doc/example.conf b/doc/example.conf
index e768e9b..454f966 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -4,7 +4,7 @@
  * Copyright (C) 2002-2005 ircd-ratbox development team
  * Copyright (C) 2005-2006 charybdis development team
  *
- * $Id: example.conf 3472 2007-05-24 04:02:33Z nenolod $
+ * $Id: example.conf 3474 2007-05-24 04:16:02Z nenolod $
  *
  * See reference.conf for more information.
  */
@@ -23,6 +23,7 @@
 #loadmodule "extensions/m_findforwards.so";
 #loadmodule "extensions/m_identify.so";
 #loadmodule "extensions/no_oper_invis.so";
+#loadmodule "extensions/sno_channeljoin.so";
 #loadmodule "extensions/sno_farconnect.so";
 #loadmodule "extensions/sno_globalkline.so";
 #loadmodule "extensions/sno_globaloper.so";
diff --git a/doc/reference.conf b/doc/reference.conf
index d13e0de..ff91821 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -6,7 +6,7 @@
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
- * $Id: reference.conf 3472 2007-05-24 04:02:33Z nenolod $
+ * $Id: reference.conf 3474 2007-05-24 04:16:02Z nenolod $
  */
 
 /* IMPORTANT NOTES:
@@ -54,10 +54,11 @@
  * Find channel forwards                          -- m_findforwards.so
  * /identify support                              -- m_identify.so
  * Opers cannot be invisible (umode +i)           -- no_oper_invis.so
+ * Channel join notices (snomask +j)              -- sno_channeljoin.so
  * Far connection notices (snomask +F)            -- sno_farconnect.so
  * Remote k/d/g/x line active notices             -- sno_globalkline.so
  * Remote oper up notices                         -- sno_globaloper.so
- * /whois notifications                           -- sno_whois.so
+ * /whois notifications (snomask +W)              -- sno_whois.so
  */
 #loadmodule "extensions/createauthonly.so";
 #loadmodule "extensions/extb_account.so";
@@ -72,6 +73,7 @@
 #loadmodule "extensions/m_findforwards.so";
 #loadmodule "extensions/m_identify.so";
 #loadmodule "extensions/no_oper_invis.so";
+#loadmodule "extensions/sno_channeljoin.so";
 #loadmodule "extensions/sno_farconnect.so";
 #loadmodule "extensions/sno_globalkline.so";
 #loadmodule "extensions/sno_globaloper.so";
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 90ca1f5..eba5382 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -1,7 +1,7 @@
 #
 # Makefile.in for ircd/contrib
 #
-# $Id: Makefile.in 3470 2007-05-24 04:01:12Z nenolod $
+# $Id: Makefile.in 3474 2007-05-24 04:16:02Z nenolod $
 #
 CC		= @CC@
 RM		= @RM@
@@ -37,6 +37,7 @@ SRCS =                          \
   extb_extgecos.c		\
   hurt.c			\
   ip_cloaking.c			\
+  sno_channeljoin.c		\
   sno_farconnect.c		\
   sno_globalkline.c		\
   sno_globaloper.c		\
diff --git a/extensions/sno_channeljoin.c b/extensions/sno_channeljoin.c
new file mode 100644
index 0000000..f54a84d
--- /dev/null
+++ b/extensions/sno_channeljoin.c
@@ -0,0 +1,45 @@
+/*
+ * +j snomask: Channel join notices.
+ *    --nenolod
+ *
+ * To be discussed:
+ *    + part notices?
+ *
+ * $Id: sno_channeljoin.c 3474 2007-05-24 04:16:02Z nenolod $
+ */
+
+#include "stdinc.h"
+#include "modules.h"
+#include "hook.h"
+#include "client.h"
+#include "ircd.h"
+#include "send.h"
+
+static void
+show_channeljoin(hook_data_channel_activity *info)
+{
+	sendto_realops_snomask(snomask_modes['j'], L_ALL,
+		"%s (%s@%s) has joined channel %s", info->client->name,
+		info->client->username, info->client->host, info->chptr->chname);
+}
+
+mapi_hfn_list_av1 channeljoin_hfnlist[] = {
+        {"channel_join", (hookfn) show_channeljoin},
+        {NULL, NULL}
+};
+
+static int
+init(void)
+{
+	snomask_modes['j'] = find_snomask_slot();
+
+	return 0;
+}
+
+static void
+fini(void)
+{
+	snomask_modes['j'] = 0;
+}
+
+DECLARE_MODULE_AV1(sno_channeljoin, init, fini, NULL, NULL, channeljoin_hfnlist, "$Revision: 3474 $");
diff --git a/include/serno.h b/include/serno.h
index 458fdc4..55967ae 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070524-3470"
+#define SERNO "20070524-3472"