diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 6475ff291befb9af54d1dabcabda60c79d3c5271..03bf5e8237d398282a63a2b581c50a995ee63471 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -137,7 +137,7 @@ $conf['proxy']['ssl']  = 0;
 
 /* Safemode Hack */
 
-$conf['safemodehack'] = 0;               //read http://wiki.splitbrain.org/wiki:safemodehack !
+$conf['safemodehack'] = 0;               //read http://www.dokuwiki.org/config:safemodehack !
 $conf['ftp']['host'] = 'localhost';
 $conf['ftp']['port'] = '21';
 $conf['ftp']['user'] = 'user';
diff --git a/conf/mediameta.php b/conf/mediameta.php
index 1ad2587ee8918d6a9886cc3bc297885f133c91d8..ba71176431400e290d60aadaee32344eac2cc877 100644
--- a/conf/mediameta.php
+++ b/conf/mediameta.php
@@ -20,7 +20,7 @@
  * conf/mediameta.local.php file
  *
  * For a list of available EXIF/IPTC fields refer to
- * http://wiki.splitbrain.org/wiki:tpl:detail.php
+ * http://www.dokuwiki.org/devel:templates:detail.php
  */
 
 
diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index 8cf78255330118420d7ad9ce8907046cd736b391..6a7f8eaac3d8ba80605cfed7f5493106920812eb 100644
--- a/data/pages/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -2,7 +2,7 @@
 
 [[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a standards compliant, simple to use [[wp>Wiki]], mainly aimed at creating documentation of any kind. It is targeted at developer teams, workgroups and small companies. It has a simple but powerful [[wiki:syntax]] which makes sure the datafiles remain readable outside the Wiki and eases the creation of structured texts. All data is stored in plain text files -- no database is required.
 
-Read the [[doku>wiki:manual|DokuWiki Manual]] to unleash the full power of DokuWiki.
+Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki.
 
 ===== Download =====
 
diff --git a/inc/lang/fi/index.txt b/inc/lang/fi/index.txt
index 958a60e6bed6aa872121fd73ac4ba586a7856398..f4817eb1563aafb5a330af289c31d747d2175256 100644
--- a/inc/lang/fi/index.txt
+++ b/inc/lang/fi/index.txt
@@ -1,4 +1,4 @@
 ====== hakemisto ======
 
 Tämä on hakemisto kaikista saatavilla olevista sivuista järjestettynä 
-[[doku>wiki:namespace|nimiavaruuksittain]].
+[[doku>namespace|nimiavaruuksittain]].
diff --git a/inc/lang/ku/admin_acl.txt b/inc/lang/ku/admin_acl.txt
deleted file mode 100644
index ff5442e24729a8ff0d2bfa6180229143cb9aa29e..0000000000000000000000000000000000000000
--- a/inc/lang/ku/admin_acl.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-====== Access Control List Management ======
-
-On this page you can add and remove permissions for the current
-page and all the [[doku>wiki:namespaces|namespaces]] it is in.
-You should read the [[doku>wiki:acl|official documentation on ACL]]
-to fully understand how access control works.
-
-The page displays all permissions that are significant for the
-current page. Permissions regarding other pages are not shown -- to
-edit them [[this>doku.php?do=index|browse]] to the according page
-first, then change to the ACL Administration.
-
diff --git a/inc/lang/mg/admin_acl.txt b/inc/lang/mg/admin_acl.txt
deleted file mode 100644
index 4641c3c509c976dbc12b67ead164408352967456..0000000000000000000000000000000000000000
--- a/inc/lang/mg/admin_acl.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-====== Fitantanana fahazoan-dalana (Access Control List)  ======
-
-Eto amin'ity pejy ity dia afaka manampy sy mamafa alalana amin'ny pejy misokatra sy ireo [[doku>wiki:namespaces|namespaces]] misy ao. 
-Mila vakianao ny [[doku>wiki:acl|tahirin-kevitra ofisialy momba ny ACL]] mba hahafahanao mahazo ny fomba fiasan'ny ACL.
-
-Miseho eo amin'ny pejy ny alalana rehetra manan-kery ho an'ny pejy misokatra. Ny alalana momba ny pejy hafa dia tsy miseho -- mba hanamboarana
-azy ireny dia [[this>doku.php?do=index|sokafy]] aloha ilay pejy, ary ovay avy eo ny fitantanana ny ACL
-
diff --git a/inc/template.php b/inc/template.php
index cebd7b757d36f51e2857f5a8f7cad68dfc3c9441..c3cfe21f2eacef92bc9fb442d2e392a55c943c00 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -803,7 +803,7 @@ function tpl_breadcrumbs($sep='»'){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Nigel McNie <oracle.shinoda@gmail.com>
  * @author Sean Coates <sean@caedmon.net>
- * @link   http://wiki.splitbrain.org/wiki:tipsandtricks:hierarchicalbreadcrumbs
+ * @author <fredrik@averpil.com>
  * @todo   May behave strangely in RTL languages
  */
 function tpl_youarehere($sep=' &raquo; '){
diff --git a/install.php b/install.php
index a44b23696cfab4034cd2ac5b3a7b7eabfc630991..f61bc0ee9512631d89c6d7f03b6293e9b2207218 100644
--- a/install.php
+++ b/install.php
@@ -87,7 +87,7 @@ header('Content-Type: text/html; charset=utf-8');
 </head>
 <body style="">
     <h1 style="float:left">
-        <img src="http://wiki.splitbrain.org/_media/wiki:dokuwiki-64.png"
+        <img src="http://dokuwiki.org/_media/wiki:dokuwiki-64.png"
              style="vertical-align: middle;" alt="" />
         <?php echo $lang['i_installer']?>
     </h1>
@@ -134,7 +134,7 @@ header('Content-Type: text/html; charset=utf-8');
     </div>
 
 <div style="clear: both">
-  <a href="http://wiki.splitbrain.org/wiki:dokuwiki"><img src="lib/tpl/default/images/button-dw.png" alt="driven by DokuWiki" /></a>
+  <a href="http://dokuwiki.org/"><img src="lib/tpl/default/images/button-dw.png" alt="driven by DokuWiki" /></a>
   <a href="http://www.php.net"><img src="lib/tpl/default/images/button-php.gif" alt="powered by PHP" /></a>
 </div>
 </body>
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index e266a1b16e34efb72367c6ed37f408cc3785a43a..590eaba5ec06b9134208ae98e524a1147c96b7ab 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -34,7 +34,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             'date'   => '2008-03-15',
             'name'   => 'ACL',
             'desc'   => 'Manage Page Access Control Lists',
-            'url'    => 'http://wiki.splitbrain.org/wiki:acl',
+            'url'    => 'http://dokuwiki.org/plugin:acl',
         );
     }
 
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 90b249202391b0f3e87f6b0825bc60f19ec8dc06..51e4c13a0d6ee075a493746d4fee35f29377de6a 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -45,7 +45,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         'date'   => '2007-08-05',
         'name'   => 'Configuration Manager',
         'desc'   => "Manage Dokuwiki's Configuration Settings",
-        'url'    => 'http://wiki.splitbrain.org/plugin:config',
+        'url'    => 'http://dokuwiki.org/plugin:config',
       );
     }
 
diff --git a/lib/plugins/importoldchangelog/action.php b/lib/plugins/importoldchangelog/action.php
index 29cea06c1ecec370dd5a4cd017c4ec9439c8821b..dcb3a9f84f58ca8f2a5d7fb71d6b64ba17931546 100644
--- a/lib/plugins/importoldchangelog/action.php
+++ b/lib/plugins/importoldchangelog/action.php
@@ -7,23 +7,23 @@ require_once(DOKU_PLUGIN.'action.php');
 
 class action_plugin_importoldchangelog extends DokuWiki_Action_Plugin {
 
-	function getInfo(){
-		return array(
-			'author' => 'Ben Coburn',
-			'email'  => 'btcoburn@silicodon.net',
-			'date'   => '2006-10-29',
-			'name'   => 'Import Old Changelog',
-			'desc'   => 'Imports and converts the single file changelog '.
+    function getInfo(){
+        return array(
+            'author' => 'Ben Coburn',
+            'email'  => 'btcoburn@silicodon.net',
+            'date'   => '2006-10-29',
+            'name'   => 'Import Old Changelog',
+            'desc'   => 'Imports and converts the single file changelog '.
                         'from the 2006-03-09 release to the new format. '.
                         'Also reconstructs missing changelog data from  '.
                         'old revisions kept in the attic.',
-            'url'    => 'http://wiki.splitbrain.org/wiki:changelog'
-			);
-	}
+            'url'    => 'http://dokuwiki.org/plugin:importoldchangelog'
+            );
+    }
 
-	function register(&$controller) {
+    function register(&$controller) {
         $controller->register_hook('TEMPORARY_CHANGELOG_UPGRADE_EVENT', 'BEFORE', $this, 'run_import');
-	}
+    }
 
     function importOldLog($line, &$logs) {
         global $lang;
diff --git a/lib/plugins/importoldindex/action.php b/lib/plugins/importoldindex/action.php
index 26b37664cd51fab2e7dab73611ce2515677c3934..2ba970e696c4e9159f294de75d6aeb81a4074c2b 100644
--- a/lib/plugins/importoldindex/action.php
+++ b/lib/plugins/importoldindex/action.php
@@ -14,7 +14,7 @@ class action_plugin_importoldindex extends DokuWiki_Action_Plugin {
             'date'   => '2006-11-09',
             'name'   => 'Import Old Index',
             'desc'   => 'Moves old index files to a new location, sorted by string length.',
-            'url'    => 'http://whoopdedo.org/doku/wiki'
+            'url'    => 'http://dokuwiki.org/plugin:importoldindex'
             );
     }
 
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index 044b046f89a661331eba4c527c279611da9b60d7..acbdf7924637e4fe159eb9d00b22661f6e921bae 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -28,7 +28,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
             'date'   => '2006-12-09',
             'name'   => 'Info Plugin',
             'desc'   => 'Displays information about various DokuWiki internals',
-            'url'    => 'http://wiki.splitbrain.org/plugin:info',
+            'url'    => 'http://dokuwiki.org/plugin:info',
         );
     }
 
diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php
index 1b79018c1645b2682118897c5e98526e510bf492..573d8ebe37a5b2582f30f6b74565f6303ef50114 100644
--- a/lib/plugins/plugin/admin.php
+++ b/lib/plugins/plugin/admin.php
@@ -60,7 +60,7 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin {
         'date'   => '2005-08-10',
         'name'   => 'Plugin Manager',
         'desc'   => "Manage Plugins, including automated plugin installer $disabled",
-        'url'    => 'http://wiki.splitbrain.org/plugin:plugin',
+        'url'    => 'http://dokuwiki.org/plugin:plugin',
       );
     }
 
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index e349fe021fb6c6763099b8f83d3b00cd457bb5ea..d084f5b5815d5777d681524efb7aaf09c1e70d69 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -32,7 +32,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
             'date'   => $this->version,
             'name'   => 'Popularity Feedback Plugin',
             'desc'   => 'Send anonymous data about your wiki to the developers.',
-            'url'    => 'http://wiki.splitbrain.org/wiki:popularity',
+            'url'    => 'http://dokuwiki.org/plugin:popularity',
         );
     }
 
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index 86d9e346d2afd2687fcd3e258324d201761c7aef..00f7632c3b6c56702f73243dec98f36d465de902 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -34,7 +34,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
             'date'   => '2008-05-94',
             'name'   => 'Revert Manager',
             'desc'   => 'Allows you to mass revert recent edits',
-            'url'    => 'http://wiki.splitbrain.org/plugin:revert',
+            'url'    => 'http://dokuwiki.org/plugin:revert',
         );
     }
 
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index c5b720444fd6f0bc64d452a4033fee2c38273662..0a3de919f8acf9819e2ae46efced88b1fb8b2b89 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -64,7 +64,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             'date'   => '2005-11-24',
             'name'   => 'User Manager',
             'desc'   => 'Manage users '.$this->disabled,
-            'url'    => 'http://wiki.splitbrain.org/plugin:usermanager',
+            'url'    => 'http://dokuwiki.org/plugin:usermanager',
         );
     }
      /**
diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
index 0e8ddc7436a4f71a15b255f08a46bf40ef038ce7..76535856805dccd4017dc0ac715d58e41b3b65f1 100644
--- a/lib/tpl/default/detail.php
+++ b/lib/tpl/default/detail.php
@@ -7,7 +7,7 @@
  * You should leave the doctype at the very top - It should
  * always be the very first line of a document.
  *
- * @link   http://wiki.splitbrain.org/wiki:tpl:templates
+ * @link   http://dokuwiki.org/templates
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 
diff --git a/lib/tpl/default/footer.html b/lib/tpl/default/footer.html
index 9e948e926cb2f2a49726b72e13a557042c6c3d36..cfc7ed4e1ac63055e1746a53f2e22d65806cbfe2 100644
--- a/lib/tpl/default/footer.html
+++ b/lib/tpl/default/footer.html
@@ -14,7 +14,7 @@ $tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' :
 
   <a <?php echo $tgt?> href="http://creativecommons.org/licenses/by-nc-sa/2.0/" rel="license" title="Creative Commons License"><img src="<?php echo DOKU_TPL; ?>images/button-cc.gif" width="80" height="15" alt="Creative Commons License" /></a>
 
-  <a <?php echo $tgt?> href="http://wiki.splitbrain.org/wiki:donate" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a>
+  <a <?php echo $tgt?> href="http://dokuwiki.org/donate" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a>
 
   <a <?php echo $tgt?> href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
 
@@ -22,7 +22,7 @@ $tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' :
 
   <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
 
-  <a <?php echo $tgt?> href="http://wiki.splitbrain.org/wiki:dokuwiki" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
+  <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
 
 
 <?php
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 7ce920b5669366b84df7615decace8104018a2af..3982618dfdccc8d45633e3d81822d59aeef3f9d5 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -8,7 +8,7 @@
  * You should leave the doctype at the very top - It should
  * always be the very first line of a document.
  *
- * @link   http://wiki.splitbrain.org/wiki:tpl:templates
+ * @link   http://dokuwiki.org/templates
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 
diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php
index 1da6dfd00c9497818b68b0dcf475be38218f682c..7b7fe8675d4a87c0de793492f884d2ad2572908d 100644
--- a/lib/tpl/default/mediamanager.php
+++ b/lib/tpl/default/mediamanager.php
@@ -9,7 +9,7 @@
  * You should leave the doctype at the very top - It should
  * always be the very first line of a document.
  *
- * @link   http://wiki.splitbrain.org/wiki:tpl:templates
+ * @link   http://dokuwiki.org/templates
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 ?>