diff --git a/Documentation.html b/Documentation.html
index e49750f30..0a8fc02a4 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -39,7 +39,7 @@
             phpMyAdmin homepage</a></li>
     <li><a href="https://sf.net/projects/phpmyadmin/">
             SourceForge phpMyAdmin project page</a></li>
-    <li><a href="http://wiki.cihar.com">
+    <li><a href="http://wiki.phpmyadmin.net">
             Official phpMyAdmin wiki</a></li>
     <li>Local documents:
         <ul><li>Version history: <a href="changelog.php">ChangeLog</a></li>
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 55c76ad13..7908b16d6 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -5,7 +5,7 @@
  * manual configuration. For easier setup you can use scripts/setup.php
  *
  * All directives are explained in Documentation.html and on phpMyAdmin
- * wiki <http://wiki.cihar.com>.
+ * wiki <http://wiki.phpmyadmin.net>.
  *
  * @version $Id$
  */
diff --git a/main.php b/main.php
index 0e67a8d65..c53ff8196 100644
--- a/main.php
+++ b/main.php
@@ -301,7 +301,7 @@ echo '<li id="li_select_fontsize">';
 echo PMA_Config::getFontsizeForm();
 echo '</li>';
 PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html', null, '_blank');
-PMA_printListItem($strPmaWiki, 'li_pma_docs2', 'http://wiki.cihar.com', null, '_blank');
+PMA_printListItem($strPmaWiki, 'li_pma_docs2', 'http://wiki.phpmyadmin.net', null, '_blank');
 
 if ($cfg['ShowPhpInfo']) {
     PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query);
diff --git a/scripts/setup.php b/scripts/setup.php
index 55fdbc819..16a9a2aaa 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -313,7 +313,7 @@ function get_cfg_doc($anchor) {
         '<a href="../Documentation.html#cfg_' . $anchor . '" target="pma_doc" class="doc">' .
         '<img class="icon" src="../' . $GLOBALS['cfg']['ThemePath'] . '/original/img/b_help.png" width="11" height="11" alt="Documentation" title="Documentation" />' .
         '</a>' .
-        '<a href="http://wiki.cihar.com/pma/Config#' . $wiki . '" target="pma_doc" class="doc">' .
+        '<a href="http://wiki.phpmyadmin.net/pma/Config#' . $wiki . '" target="pma_doc" class="doc">' .
         '<img class="icon" src="../' . $GLOBALS['cfg']['ThemePath'] . '/original/img/b_info.png" width="11" height="11" alt="Wiki" title="Wiki" />' .
         '</a>' .
         '</span>'