diff --git a/bin/Makefile.am b/bin/Makefile.am
index e10dbab1c1c224a881c9c19f076f13ba8ea36536..7d48c8527f73fbbd52da97f5fa176d6db184054c 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 # put scripts into dist-tarball
-EXTRA_DIST = duneproject idrename wmlwrap
+EXTRA_DIST = duneproject wmlwrap dunecontrol
 
 # ... and install some
 bin_SCRIPTS = duneproject
diff --git a/bin/dunecontrol b/bin/dunecontrol
index 8b0f034fabfcfb375e2133261f0f8e70465d3a5d..6b5a97d855efe43987bbc048f342324f2b502460 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -330,7 +330,7 @@ usage () {
     echo "  -h, --help         show this help"
     echo "      --debug        enable debug output of this script"
     echo "      --opts=FILE    load default options from FILE"
-    echo "                     (see dune-common/bin/example.opts)"
+    echo "                     (see dune-common/doc/example.opts)"
     echo "Commands:"
     printf "  \`help'\tguess what :-)\n"
     printf "  \`print'\tprint the list of modules sorted after their dependencies\n"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4cb49f7b93109120ccda8fc80d99353fcfcdee79..af78fdfa810a636f8c97bf08453eee7956099a18 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,6 +16,7 @@ CURDIR=doc
 # position of the web base directory,
 # relative to $(CURDIR)
 BASEDIR=..
+EXTRAINSTALL=example.opts
 
 # install the html pages
 docdir=$(datadir)/doc/dune-common
diff --git a/doc/buildsystem/buildsystem.tex b/doc/buildsystem/buildsystem.tex
index cbbef857feeec625ba5d7ef1f7e48043a6c67489..fca9f10fd08be08c953376555f20edcfdd16637e 100644
--- a/doc/buildsystem/buildsystem.tex
+++ b/doc/buildsystem/buildsystem.tex
@@ -562,7 +562,7 @@ in a varible called \texttt{\textit{COMMAND}\,\_FLAGS} with
 \texttt{\textit{COMMAND}} writen in capital letters.
 
 \begin{lst}[File examle.opts] \mbox{}
-\lstinputlisting{../../bin/example.opts}
+\lstinputlisting{../example.opts}
 \end{lst}
 
 When you specify an opts file and command line paramters
diff --git a/bin/example.opts b/doc/example.opts
similarity index 100%
rename from bin/example.opts
rename to doc/example.opts
diff --git a/doc/installation-notes.wml b/doc/installation-notes.wml
index ef6c25990e7f2d25a16069b52cc90dc700fa59e7..73d7712337dd3cb2cfef7f115a2355306e7ba317 100644
--- a/doc/installation-notes.wml
+++ b/doc/installation-notes.wml
@@ -214,10 +214,15 @@ cd UG-3.9.1
 </li>
 <p>
     See <a
-    href="http://hal.iwr.uni-heidelberg.de/dune/download.html">Download
+    href="http://dune-project.org/download.html">Download
     Section</a> 
     section for more details. 
 </p>
+<p>
+When using the unstable version via svn, you might be interested in
+the <a href="http://dune-project.org/svn.html">DUNE SVN Developer
+Info</a> section.
+</p>
 
 <li> <p>Building all DUNE modules</p></li>
 <p>
@@ -229,7 +234,9 @@ cd UG-3.9.1
 <kbd> <pre> ./dune-common/bin/dunecontrol all</pre> </kbd> 
 
 <p>
- Read <a href="http://hal.iwr.uni-heidelberg.de/dune/svn.html">Building DUNE </a> section for more details. 
+ Read the <a
+ href="http://dune-project.org/doc/buildsystem/buildsystem.pdf">DUNE
+ Build System Howto</a> section for more details. 
 </p>
 
 <li> <p>Building a specific DUNE module (and its dependent modules)</p></li>
@@ -239,19 +246,24 @@ cd UG-3.9.1
 </pre> </kbd> 
 where module_name is the name of that particular module given in the dune.module file 
 </p>
-<p> Read <a href="http://hal.iwr.uni-heidelberg.de/dune/dunemodule.html">Maintaining new Dune modules and applications</a> section for more details.
+<p> Read <a href="http://dune-project.org/dunemodule.html">Maintaining new Dune modules and applications</a> section for more details.
 </p>
 <li> <p>Building using certain configure options</p></li>
 <p> Run dunecontrol script 
 <kbd> <pre>
-./dune-common/bin/dunecontrol --opts=/path to/file.opts --module=module_name all
+./dune-common/bin/dunecontrol --opts=/path_to/file.opts --module=module_name all
 </pre> </kbd> 
-where file.opts is the name of the file with configure options specified (you can find an example.opts file in the dune-common/bin directory) 
+where file.opts is the name of the file with configure options
+specified (you can find an <a href="example.opts">example.opts</a>
+file in the dune-common/doc directory)
 </p>
 
-<p> Read <a href="http://hal.iwr.uni-heidelberg.de/dune/dunemodule.html">Maintaining new Dune modules and applications</a> section for more details.
+<p>Read <a href="http://dune-project.org/dunemodule.html">Maintaining new Dune modules and applications</a> section for more details.
 </p>
-<p> <a href="http://hal.iwr.uni-heidelberg.de/dune/doc/buildsystem/buildsystem.pdf"> DUNE Build System Howto</a> will also give you an excellent introduction to the build system and how to create new modules/projects your own.
+<p> <a
+href="http://dune-project.org/doc/buildsystem/buildsystem.pdf">DUNE
+Build System Howto</a> will also give you an excellent introduction to
+the build system and how to create new modules/projects your own.
 </p>
 </li>
 </ol>