diff --git a/CREDITS b/CREDITS
deleted file mode 100644
index f2ad3bac7..000000000
--- a/CREDITS
+++ /dev/null
@@ -1,43 +0,0 @@
-Charybdis started as an evolution from ircd-ratbox. Its development
-is led by a team of dedicated developers who have put a lot of time
-into the project and it has seen use on a variety of different
-network configurations.
-
-The Charybdis core team, listed in nick-alphabetical order:
-
-amdj, Aaron Jones <aaronmdjones -at- gmail.com>
-Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
-jilles, Jilles Tjoelker <jilles -at- stack.nl>
-kaniini, William Pitcock <nenolod -at- dereferenced.org>
-lp0, Simon Arlott <simon -at- arlott.org>
-mr_flea, Keith Buck <mr_flea -at- esper.net>
-
-The following people are also project members, listed in nick-alphabetical
-order:
-
-grawity, Mantas Mikulėnas <grawity -at- gmail.com>
-jdhore, JD Horelick <jdhore1 -at- gmail.com>
-viatsko, Valerii Iatsko <dwr -at- codingbox.io>
-
-The following people have made contributions to the Charybdis releases,
-in nick-alphabetical order:
-
-AndroSyn, Aaron Sethman <androsyn -at- ratbox.org>
-anfl, Lee Hardy <lee -at- leeh.co.uk>
-beu, Elfyn McBratney <elfyn.mcbratney -at- gmail.com>
-BlindSight, Matt Ullman <matt -at- airraidsirens.com>
-Entrope, Michael Poole <mdpoole -at- trolius.org> 
-gxti, Michael Tharp <gxti -at- partiallystapled.com>
-mniip <mniip -at- mniip.com>
-spb, Stephen Bennett <spb -at- attenuate.org>
-Taros, Brett Greenham <taros -at- shadowircd.net>
-ThaPrince, Jon Christopherson <jon -at- vile.com>
-twincest, River Tarnell <river -at- attenuate.org>
-w00t, Robin Burchell <surreal.w00t -at- gmail.com>
-
-For a list of contributors to ircd-ratbox, ircd-hybrid, and ircd2.8 (the
-predecessors to Charybdis), see the doc/credits-past.txt file in the Charybdis
-distribution.
-
-Visit the Charybdis website at: http://www.charybdis.io/
-Visit us on IRC at: irc.charybdis.io #charybdis
diff --git a/doc/credits-past.txt b/doc/credits-past.txt
index 773c029aa..cf9342d8a 100644
--- a/doc/credits-past.txt
+++ b/doc/credits-past.txt
@@ -225,4 +225,52 @@ larne, Edward Brocklesby <ejb -at- sdf.lonestar.org>
 Of course our work is based on the work of many, many others over the past
 10 or so years since irc has existed, including the work done by the Hybrid
 team, our thanks goes to them.
- 
+
+
+===============================================================================
+IRCD-CHARYBDIS CREDITS
+===============================================================================
+
+Charybdis started as an evolution from ircd-ratbox. Its development
+is led by a team of dedicated developers who have put a lot of time
+into the project and it has seen use on a variety of different
+network configurations.
+
+The Charybdis core team, listed in nick-alphabetical order:
+
+amdj, Aaron Jones <aaronmdjones -at- gmail.com>
+Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
+jilles, Jilles Tjoelker <jilles -at- stack.nl>
+kaniini, William Pitcock <nenolod -at- dereferenced.org>
+lp0, Simon Arlott <simon -at- arlott.org>
+mr_flea, Keith Buck <mr_flea -at- esper.net>
+
+The following people are also project members, listed in nick-alphabetical
+order:
+
+grawity, Mantas Mikulėnas <grawity -at- gmail.com>
+jdhore, JD Horelick <jdhore1 -at- gmail.com>
+viatsko, Valerii Iatsko <dwr -at- codingbox.io>
+
+The following people have made contributions to the Charybdis releases,
+in nick-alphabetical order:
+
+AndroSyn, Aaron Sethman <androsyn -at- ratbox.org>
+anfl, Lee Hardy <lee -at- leeh.co.uk>
+beu, Elfyn McBratney <elfyn.mcbratney -at- gmail.com>
+BlindSight, Matt Ullman <matt -at- airraidsirens.com>
+Entrope, Michael Poole <mdpoole -at- trolius.org> 
+gxti, Michael Tharp <gxti -at- partiallystapled.com>
+mniip <mniip -at- mniip.com>
+spb, Stephen Bennett <spb -at- attenuate.org>
+Taros, Brett Greenham <taros -at- shadowircd.net>
+ThaPrince, Jon Christopherson <jon -at- vile.com>
+twincest, River Tarnell <river -at- attenuate.org>
+w00t, Robin Burchell <surreal.w00t -at- gmail.com>
+
+For a list of contributors to ircd-ratbox, ircd-hybrid, and ircd2.8 (the
+predecessors to Charybdis), see the doc/credits-past.txt file in the Charybdis
+distribution.
+
+Visit the Charybdis website at: http://www.charybdis.io/
+Visit us on IRC at: irc.charybdis.io #charybdis