diff --git a/NEWTAPS b/NEWTAPS
index e7890544504a8530a0d7926e36a672557bc4a456..638fa00526ce4a90e2e458d859b4a795e9280bf8 100644
--- a/NEWTAPS
+++ b/NEWTAPS
@@ -4,7 +4,7 @@ Reporting Unknown JTAG TAP IDS
 If OpenOCD reports an UNKNOWN or Unexpected Tap ID please report it to
 the development mailing list - However - keep reading.
 
-openocd-development@lists.berlios.de.
+openocd-devel@lists.sourceforge.net.
 
 ========================================
 
diff --git a/PATCHES.txt b/PATCHES.txt
index 856b094771bd0b79d88e3a1461fd689fa067a020..2757eacaba201cef91914b00f736bc1fe0cb0f22 100644
--- a/PATCHES.txt
+++ b/PATCHES.txt
@@ -2,7 +2,7 @@
 /** @page patchguide Patch Guidelines
 
 Please mail patches to: @par
-	openocd-development@lists.berlios.de
+	openocd-devel@lists.sourceforge.net
 
 Note that you can't send patches to that list unless
 you're a member, despite what the list info page says.
diff --git a/README b/README
index 62d1f777aecf022d6878b3e7c54c9668c9e9ba6a..f49dd31fb1cbd85877581f6e7bc802aeddca12a9 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ viewed on-line at the following URLs:
     http://openocd.sourceforge.net/doc/html/index.html
 
  OpenOCD Developer's Manual:
-    http://openocd.sourceforge.net/doc/doxygen/index.html
+    http://openocd.sourceforge.net/doc/doxygen/html/index.html
 
 These reflect the latest development versions, so the following section
 introduces how to build the complete documentation from the package.
diff --git a/doc/manual/primer/patches.txt b/doc/manual/primer/patches.txt
index a894234cfd2da02bcddb52cc4a33ca3027f4ba6c..cb3c07c292933dfbb7568c61400781e41b6dbee2 100644
--- a/doc/manual/primer/patches.txt
+++ b/doc/manual/primer/patches.txt
@@ -139,7 +139,7 @@ these maintainers.
 
 Patches must be sent to the OpenOCD developer mailing list:
 @par
-	openocd-development@lists.berlios.de
+	openocd-devel@lists.sourceforge.net
 
 They will be reviewed and committed if the changes are found to be
 acceptable.  If there are problems, you will receive feedback via the
diff --git a/doc/manual/server.txt b/doc/manual/server.txt
index f6a06700bf45078728473dbee1ff88d2ec6ef9d4..3c2fbd0e3a6ca45d4cb895a335b01f1bd64e921b 100644
--- a/doc/manual/server.txt
+++ b/doc/manual/server.txt
@@ -309,3 +309,8 @@ This section needs to be expanded.
 
  */
 
+/** @page serverhttp OpenOCD http Server API
+
+This section needs to be expanded.
+
+ */
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 817c4f93f3f258fe205b83eeef5c7c4e3f8641cd..17599318284081c7dbfe0cfabb14fbf0de10ed01 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -168,7 +168,7 @@ STM32x). Preliminary support for various NAND flash controllers
 
 The OpenOCD web site provides the latest public news from the community:
 
-@uref{http://openocd.sourceforge.net/web/}
+@uref{http://openocd.sourceforge.net/}
 
 @section Latest User's Guide: