diff --git a/ChangeLog b/ChangeLog
index fd3d188..81f3032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+nenolod     2007/05/24 04:01:12 UTC	(20070524-3470)
+  Log:
+  - fold in whois_notice_global functionality.
+  
+
+  Changes:	Modified:
+  +0 -1		trunk/extensions/Makefile.in (File Modified) 
+  +1 -56	trunk/extensions/sno_whois.c (File Modified) 
+  + -		trunk/extensions/spy_whois_notice_global.c (File Deleted) 
+
+
 nenolod     2007/05/24 03:58:27 UTC	(20070524-3468)
   Log:
   - rework spy_whois_notice as a snomask-implementing module, snomask +W.
diff --git a/doc/example.conf b/doc/example.conf
index 5e261e3..e768e9b 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 3460 2007-05-18 20:31:33Z jilles $
+ * $Id: example.conf 3472 2007-05-24 04:02:33Z nenolod $
  *
  * See reference.conf for more information.
  */
@@ -26,6 +26,7 @@
 #loadmodule "extensions/sno_farconnect.so";
 #loadmodule "extensions/sno_globalkline.so";
 #loadmodule "extensions/sno_globaloper.so";
+#loadmodule "extensions/sno_whois.so";
 
 serverinfo {
 	name = "hades.arpa";
diff --git a/doc/reference.conf b/doc/reference.conf
index b821e2d..d13e0de 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -6,7 +6,7 @@
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
- * $Id: reference.conf 3460 2007-05-18 20:31:33Z jilles $
+ * $Id: reference.conf 3472 2007-05-24 04:02:33Z nenolod $
  */
 
 /* IMPORTANT NOTES:
@@ -57,6 +57,7 @@
  * 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
  */
 #loadmodule "extensions/createauthonly.so";
 #loadmodule "extensions/extb_account.so";
@@ -74,6 +75,7 @@
 #loadmodule "extensions/sno_farconnect.so";
 #loadmodule "extensions/sno_globalkline.so";
 #loadmodule "extensions/sno_globaloper.so";
+#loadmodule "extensions/sno_whois.so";
  
 /* serverinfo {}:  Contains information about the server. (OLD M:) */
 serverinfo {
diff --git a/include/serno.h b/include/serno.h
index 8a919ab..458fdc4 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070524-3468"
+#define SERNO "20070524-3470"