diff --git a/README.md b/README.md
index f9e76625..217646a6 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Installation
 
 Please remember to change the administrator account password.
 
-See also: [Configuration Basics](http://tinyboard.org/docs/config_basics.html).
+See also: [Configuration Basics](http://tinyboard.org/docs/?p=Config).
 
 Support
 --------
diff --git a/inc/config.php b/inc/config.php
index 85f825f9..3e65ef56 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -17,7 +17,7 @@
  *  Some directives are commented out. This is either because they are optional and examples, or because
  *  they are "optionally configurable", and given their default values by Tinyboard's code later if unset.
  *
- *  More information: http://tinyboard.org/wiki/index.php?title=Config
+ *  More information: http://tinyboard.org/docs/?p=Config
  *
  */
 
@@ -141,7 +141,7 @@
 	// Same as above but different IP address
 	$config['flood_time_same'] = 30;
 	
-	// DNS blacklists (DNSBL) http://tinyboard.org/docs/dnsbl.html
+	// DNS blacklists (DNSBL) http://tinyboard.org/docs/?p=Config/DNSBL
 	
 	// http://www.sectoor.de/tor.php
 	$config['dnsbl'][] = Array('tor.dnsbl.sectoor.de', 1); // Tor exit servers
@@ -967,6 +967,8 @@
  * ====================
  */
 
+	// http://tinyboard.org/docs/?p=Events
+
 	// event_handler('post', function($post) {
 	// 	// do something
 	// });
diff --git a/install.php b/install.php
index 4e21a4ef..c76c1061 100644
--- a/install.php
+++ b/install.php
@@ -327,7 +327,7 @@
 			<label for="db_pass">Password:</label> 
 			<input type="password" id="db_pass" name="db[password]" value="" />
 		</fieldset>
-		<p style="text-align:center" class="unimportant">The following is all later configurable. For more options, <a href="http://tinyboard.org/docs/config_basics.html">edit your configuration files</a> after installing.</p>
+		<p style="text-align:center" class="unimportant">The following is all later configurable. For more options, <a href="http://tinyboard.org/docs/?p=Config">edit your configuration files</a> after installing.</p>
 		<fieldset>
 		<legend>Cookies</legend>
 			<label for="cookies_mod">Moderator cookie:</label> 
@@ -496,7 +496,7 @@
 		}
 		
 		$page['title'] = 'Installation complete';
-		$page['body'] = '<p style="text-align:center">Thank you for using Tinyboard. Please remember to report any bugs you discover. <a href="http://tinyboard.org/docs/config_basics.html">How do I edit the config files?</a></p>';
+		$page['body'] = '<p style="text-align:center">Thank you for using Tinyboard. Please remember to report any bugs you discover. <a href="http://tinyboard.org/docs/?p=Config">How do I edit the config files?</a></p>';
 		
 		if(!empty($sql_errors)) {
 			$page['body'] .= '<div class="ban"><h2>SQL errors</h2><p>SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a Tinyboard installation; if so, you can probably ignore this.</p><p>The errors encountered were:</p><ul>' . $sql_errors . '</ul><p><a href="?step=5">Ignore errors and complete installation.</a></p></div>';