diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index d6d56198a4a8750800f9b4b6c2efde81a6610907..9ea8ed6a8c230182f68267db65c63e6a99859ef0 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -22,7 +22,7 @@ google.de http://www.google.de/search?q=
 man       http://man.cx/
 phpfn     http://www.php.net/{NAME}
 go        http://www.google.com/search?q={URL}&btnI=lucky
-bug       http://bugs.splitbrain.org/index.php?do=details&id=
+dokubug   http://bugs.splitbrain.org/index.php?do=details&id=
 coral     http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY}
 xref      http://dev.splitbrain.org/reference/dokuwiki/{NAME}.html
 
diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index b49ebfd8076dee5b99654ad5ff8e5cc414ec3d8b..82dce90b47d6336fd8352ea5df9f70f18db5bcb8 100644
--- a/data/pages/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -34,6 +34,7 @@ All documentation and additional information besides the [[syntax|syntax descrip
   * [[doku>wiki:manual|The manual]] :!:
   * [[doku>wiki:FAQ|Frequently Asked Questions (FAQ)]]
   * [[doku>wiki:glossary|Glossary]]
+  * [[http://search.dokuwiki.org|Search for DokuWiki help and documentation]]
 
 **Customizing DokuWiki**
 
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt
index 40baa16cb0962ef8d6decff3e971df9ff399b652..8dc38a5b9f3b00632ae78595b78a3f6a5cd0102c 100644
--- a/data/pages/wiki/syntax.txt
+++ b/data/pages/wiki/syntax.txt
@@ -73,6 +73,7 @@ DokuWiki supports [[doku>wiki:interwiki|Interwiki]] links. These are quick links
   DokuWiki supports [[doku>wiki:interwiki|Interwiki]] links. These are quick links to other Wikis.
   For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
 
+
 ==== Windows Shares ====
 
 Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogenous user group like a corporate [[wp>Intranet]].
@@ -83,7 +84,7 @@ Notes:
 
   * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
   * For Mozilla and Firefox it can be enabled through the config option [[http://www.mozilla.org/quality/networking/docs/netprefs.html#file|security.checkloaduri]] but this is not recommended.
-  * See [[bug>151]] for more info.
+  * See [[dokubug>151]] for more info.
 
 ==== Image Links ====
 
diff --git a/lib/images/interwiki/bug.gif b/lib/images/interwiki/dokubug.gif
similarity index 100%
rename from lib/images/interwiki/bug.gif
rename to lib/images/interwiki/dokubug.gif