diff --git a/BUGS b/BUGS
index 3ef29d0..5cc3fa5 100644
--- a/BUGS
+++ b/BUGS
@@ -18,10 +18,11 @@
       We will likely have a workaround implemented in the next version.
 
 BUG REPORTS: If you run this code and encounter problems, you must report
- the bug via IRC, irc.atheme.net #athemenet-dev.
+ the bug on http://bugs-meta.atheme.org/ (Charybdis project) or via IRC,
+ irc.atheme.org #charybdis.
 
  Please include a gdb backtrace and keep your binaries, modules and core file
  in case the developers need more information.
 
 --------------------------------------------------------------------------------
-$Id: BUGS 1634 2006-06-04 13:26:04Z jilles $
+$Id: BUGS 3344 2007-04-01 22:20:00Z jilles $
diff --git a/ChangeLog b/ChangeLog
index ace9ff7..bf92b9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+jilles      2007/04/01 22:10:05 UTC	(20070401-3342)
+  Log:
+  Change copyright years in version.c.SH as in release-2.1 r3339.
+  
+
+  Changes:	Modified:
+  +2 -2		trunk/src/version.c.SH (File Modified) 
+
+
 jilles      2007/03/30 23:34:11 UTC	(20070330-3325)
   Log:
   Rerun autoconf.
diff --git a/NEWS b/NEWS
index ea7d513..20593ae 100644
--- a/NEWS
+++ b/NEWS
@@ -364,7 +364,8 @@ See LICENSE for licensing details (GPL v2).
 BUGS: Major bugs in this release are listed in BUGS
 
 BUG REPORTS: If you run this code and encounter problems, you must report
-via IRC to irc.atheme.net, #athemenet-dev.
+via IRC to irc.atheme.org, #charybdis. For specific bugs you can use
+http://bugs-meta.atheme.org/ (Charybdis project).
 
 Please include a gdb backtrace and keep the core file, binaries and 
 modules in case the developers need them.
@@ -372,5 +373,5 @@ modules in case the developers need them.
 Other files recommended for reading: BUGS, README.FIRST, INSTALL
 
 --------------------------------------------------------------------------------
-$Id: NEWS 3281 2007-03-25 17:59:50Z jilles $
+$Id: NEWS 3344 2007-04-01 22:20:00Z jilles $
 
diff --git a/include/serno.h b/include/serno.h
index a1b708f..4e4d0a3 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070330-3325"
+#define SERNO "20070401-3342"