diff --git a/INSTALL.md b/INSTALL.md
index 23304779..1fa99100 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -467,7 +467,7 @@ make install
 
 <a name="Clients" />
 ####Clients:
-While [Toxic](https://github.com/tox/toxic) is no longer in core, a list of Tox clients are located in our [wiki](http://wiki.tox.im/client)
+While [Toxic](https://github.com/tox/toxic) is no longer in core, a list of Tox clients are located in our [wiki](https://wiki.tox.chat/doku.php?id=clients)
 
 
 
diff --git a/README.md b/README.md
index 1844fbd5..ab18debc 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,7 @@
 
 With the rise of governmental monitoring programs, Tox, a FOSS initiative, aims to be an easy to use, all-in-one communication platform that ensures their users full privacy and secure message delivery.<br /> <br />
 
-[**Website**](http://utox.org) **|** [**Wiki**](https://wiki.tox.im/) **|** [**Blog**](https://blog.tox.im/) **|** [**FAQ**](https://wiki.tox.im/FAQ) **|** [**Binaries/Downloads**](https://wiki.tox.im/Binaries) **|** [**Clients**](https://wiki.tox.im/Client) **|** [**Compiling**](/INSTALL.md) **|** 
-[**API**](https://libtoxcore.so/)  **|** **IRC Channel:** [#tox@freenode](https://webchat.freenode.net/?channels=tox)
+[**Website**](https://tox.chat) **|** [**Wiki**](https://wiki.tox.chat/) **|** [**Blog**](https://blog.tox.chat/) **|** [**FAQ**](https://wiki.tox.chat/doku.php?id=users:faq) **|** [**Binaries/Downloads**](https://wiki.tox.chat/doku.php?id=developers:binaries) **|** [**Clients**](https://wiki.tox.chat/doku.php?id=clients) **|** [**Compiling**](/INSTALL.md) **|** **IRC Channel:** [#tox@freenode](https://webchat.freenode.net/?channels=tox)
 
 
 ## The Complex Stuff:
@@ -38,4 +37,3 @@ The goal of this project is to create a configuration-free P2P Skype replacement
 - [DHT Protocol](/docs/updates/DHT.md)<br />
 - [Crypto](/docs/updates/Crypto.md)<br />
 
-Additional developer documentation can be found at [Libtoxcore.so](https://libtoxcore.so/)
diff --git a/other/DHTnodes b/other/DHTnodes
index 0abdbbd9..d2051c7a 100644
--- a/other/DHTnodes
+++ b/other/DHTnodes
@@ -1,3 +1,3 @@
 As maintaining 2 separate lists of the same information seemed redundant, this list has been phased out.
 
-For a current DHT node list please visit http://wiki.tox.im/nodes
+For a current DHT node list please visit https://wiki.tox.chat/doku.php?id=users:nodes
diff --git a/other/bootstrap_daemon/tox-bootstrapd.conf b/other/bootstrap_daemon/tox-bootstrapd.conf
index d02eb3d0..a997be5f 100644
--- a/other/bootstrap_daemon/tox-bootstrapd.conf
+++ b/other/bootstrap_daemon/tox-bootstrapd.conf
@@ -39,7 +39,7 @@ motd = "tox-bootstrapd"
 //
 // Remember to replace the provided example with your own node list.
 // There is a maintained list of bootstrap nodes on Tox's wiki, if you need it
-// (http://wiki.tox.im/Nodes).
+// (https://wiki.tox.chat/doku.php?id=users:nodes).
 //
 // You may leave the list empty or remove "bootstrap_nodes" completely,
 // in both cases this will be interpreted as if you don't want to bootstrap
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 60fe7021..85f49941 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -1,7 +1,6 @@
 /* net_crypto.c
  *
  * Functions for the core network crypto.
- * See also: http://wiki.tox.im/index.php/DHT
  *
  * NOTE: This code has to be perfect. We don't mess around with encryption.
  *