commit - d28d838cb9a8488208c10ea73b25532e1aef8e06
commit + f6b7764eb5d85692c9242d2d20cb53f091083139
blob - d26b8403ef82905b494b9c64d6c7daf27554c1c5
blob + 0f160edd834fb22ac05f40d040ea0ec7225502c5
--- doc/Capabilities.txt
+++ doc/Capabilities.txt
@@ -13,7 +13,7 @@ This document lists and describes the "IRC capabilitie
 and can be requested by a IRC/IRCv3 client that supports the "CAP" command.
 
 ngIRCd implements the "IRC Client Capabilities Extension" as described here:
-<http://www.leeh.co.uk/draft-mitchell-irc-capabilities-02.html>
+<http://ircv3.net/specs/core/capability-negotiation-3.1.html>
 
 
 I. Supported Capabilities
@@ -25,4 +25,4 @@ I. Supported Capabilities
    server to send all possible prefixes which apply to a user in NAMES and
    WHO output.
 
-   See <http://ircv3.atheme.org/extensions/multi-prefix-3.1>.
+   See <http://ircv3.net/specs/extensions/multi-prefix-3.1.html>.
blob - e4f009045cd42717ea2ef265e307b9c8e58d5549
blob + 50a52d58d56c92cec5a40d3f65fb9312f2b0cd34
--- doc/Commands.txt
+++ doc/Commands.txt
@@ -78,7 +78,7 @@ Connection Handling Commands
 	like this: "CAP REQ :capability1 capability2 capability3" for example.
 
 	References:
-	 - <http://ircv3.atheme.org/specification/capability-negotiation-3.1>
+	 - <http://ircv3.net/specs/core/capability-negotiation-3.1.html>
 	 - <http://ngircd.barton.de/doc/Capabilities.txt>
 	 - doc/Capabilities.txt
 
blob - 79ca2d72f0506131e2daf3b3e02e3522ad5628e0
blob + ea2602185b7e00ad2f477a15ba5bea11bb471f6d
--- doc/FAQ.txt
+++ doc/FAQ.txt
@@ -99,11 +99,11 @@ IV. Bugs!?
 ~~~~~~~~~~
 
 Q: Is there a list of known bugs and desired feature enhancements?
-A: Yes. Have a look at the bug tracking system (Bugzilla) for ngIRCd located
-   at <http://ngircd.barton.de/bugzilla/index.cgi>. There you can file bug
+A: Yes. Have a look at the bug tracking system (Github issues) for ngIRCd located
+   at <https://github.com/ngircd/ngircd/issues>. There you can file bug
    reports and feature requests as well as search the bug database.
 
 Q: What should I do if I found a bug?
-A: Please file a bug report at <http://ngircd.barton.de/bugzilla/index.cgi>!
-   The author of the particular component will be notified automagically :-)
+A: Please file a bug report at <https://github.com/ngircd/ngircd/issues/new>!
+   The author will be notified automagically :-)