5 files changed, 5 insertions, 5 deletions

diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index 3e8e641516..f20dfc1d85 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -121,7 +121,7 @@ Explorer that is limited in handling such files.}
 
 \section{Enabling Speech Support (optional)}\label{sec:enabling_speech_support}
 If you wish to use speech support you will also need a language file, available
-from \url{http://www.rockbox.org/twiki/bin/view/Main/VoiceFiles/}.  For the
+from \wikilink{VoiceFiles}.  For the
 English language, the file is called \fname{english.voice}. When it has been
 downloaded, unpack this file and copy it into the \fname{lang} folder which is
 inside the /\fname{.rockbox} folder on your Jukebox. Voice menus are turned on
diff --git a/manual/plugins/batterybenchmark.tex b/manual/plugins/batterybenchmark.tex
index 0e05627287..b416590db1 100755
--- a/manual/plugins/batterybenchmark.tex
+++ b/manual/plugins/batterybenchmark.tex
@@ -5,7 +5,7 @@ background (TSR plugin), reading various info about your battery while you use
 it. Once you finish your session you can find the benchmark output data in a
 file on your \dap\ \fname{/battery\_bench.txt}.
 Please submit your results to the Rockbox wiki.
-\url{http://www.rockbox.org/twiki/bin/view/Main/BatteryRuntime}
+\wikilink{BatteryRuntime}
 
 \subsubsection{How it works}
 After you load the plug-in the operation of your \dap\ continues as normal.
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index 0f71c6d31e..8d0877cdd4 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -52,7 +52,7 @@ Default keymappings:
 Some places where can you can find \fname{.ch8} files:
 \begin{itemize}
 \item The PluginChip8 page on www.rockbox.org has several attached:
-\url{http://www.rockbox.org/twiki/bin/view/Main/PluginChip8}
+\wikilink{PluginChip8}
 \item Check out the HP48 chip games section:
 \url{http://www.hpcalc.org/hp48/games/chip/}
 \item PC emulator by the guy who wrote the HP48 emulator:
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index e0b07f6cbc..6108f26efa 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -13,7 +13,7 @@ from prboom-2.2.6
 \item[Your wad files] Copy all Doom wads you wish to play into that directory.
 \end{description}
 The needed files can be found at
-\url{http://www.rockbox.org/twiki/bin/view/Main/PluginDoom}
+\wikilink{PluginDoom}
 
 To play addon wads create the \fname{addons} directory within doom. 
 Place wad files in this directory. Currently doom only supports 10 addons 
diff --git a/manual/plugins/movieplayer.tex b/manual/plugins/movieplayer.tex
index e70657d990..3c72559cbf 100644
--- a/manual/plugins/movieplayer.tex
+++ b/manual/plugins/movieplayer.tex
@@ -3,4 +3,4 @@
 Play movies on your \dap!  In order to do this, movies must be in AVI format,
 and then converted to \fname{.RVF}, Rockbox's own video format. For more
 details on how to use this plugin, please see
-\url{http://www.rockbox.org/twiki/bin/view/Main/VideoTutorial}.
+\wikilink{VideoTutorial}.