diff --git a/BUGS b/BUGS
index 4381c87b5..17a7b30e2 100644
--- a/BUGS
+++ b/BUGS
@@ -6,11 +6,11 @@ posting a message with your report:
 
 	openocd-devel@lists.sourceforge.net
 
-Also, please check the Trac bug database to see if a ticket for
+Also, please check the bug database to see if a ticket for
 the bug has already been opened.  You might be asked to open
 such a ticket, or to update an existing ticket with more data.
 
-	https://sourceforge.net/apps/trac/openocd/
+	http://bugs.openocd.org/
 
 To minimize work for OpenOCD developers, you should try to include
 all of the information listed below.  If you feel that some of the
diff --git a/README b/README
index 68a7ea907..149eec57e 100644
--- a/README
+++ b/README
@@ -61,10 +61,10 @@ In addition to the in-tree documentation, the latest manuals may be
 viewed online at the following URLs:
 
   OpenOCD User's Guide:
-    http://openocd.sourceforge.net/doc/html/index.html
+    http://openocd.org/doc/html/index.html
 
   OpenOCD Developer's Manual:
-    http://openocd.sourceforge.net/doc/doxygen/html/index.html
+    http://openocd.org/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/openocd.texi b/doc/openocd.texi
index 364b9a44e..3573d6d87 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -170,7 +170,7 @@ controllers (LPC3180, Orion, S3C24xx, more) is included.
 
 The OpenOCD web site provides the latest public news from the community:
 
-@uref{http://openocd.sourceforge.net/}
+@uref{http://openocd.org/}
 
 @section Latest User's Guide:
 
@@ -178,11 +178,11 @@ The user's guide you are now reading may not be the latest one
 available. A version for more recent code may be available.
 Its HTML form is published regularly at:
 
-@uref{http://openocd.sourceforge.net/doc/html/index.html}
+@uref{http://openocd.org/doc/html/index.html}
 
 PDF form is likewise published at:
 
-@uref{http://openocd.sourceforge.net/doc/pdf/openocd.pdf}
+@uref{http://openocd.org/doc/pdf/openocd.pdf}
 
 @section OpenOCD User's Forum
 
@@ -256,7 +256,7 @@ providing a Doxygen reference manual. This document contains more
 technical information about the software internals, development
 processes, and similar documentation:
 
-@uref{http://openocd.sourceforge.net/doc/doxygen/html/index.html}
+@uref{http://openocd.org/doc/doxygen/html/index.html}
 
 This document is a work-in-progress, but contributions would be welcome
 to fill in the gaps. All of the source files are provided in-tree,
@@ -292,7 +292,7 @@ communication between developers:
 
 The OpenOCD Bug Tracker is hosted on SourceForge:
 
-@uref{https://sourceforge.net/p/openocd/tickets/}
+@uref{http://bugs.openocd.org/}
 
 
 @node Debug Adapter Hardware
@@ -735,7 +735,7 @@ If all goes well you'll see output something like
 @example
 Open On-Chip Debugger 0.4.0 (2010-01-14-15:06)
 For bug reports, read
-        http://openocd.sourceforge.net/doc/doxygen/bugs.html
+        http://openocd.org/doc/doxygen/bugs.html
 Info : JTAG tap: lm3s.cpu tap/device found: 0x3ba00477
        (mfg: 0x23b, part: 0xba00, ver: 0x3)
 @end example
diff --git a/src/openocd.c b/src/openocd.c
index 4d4dc2c83..d17af20fe 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -328,7 +328,7 @@ int openocd_main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 	LOG_OUTPUT("For bug reports, read\n\t"
-		"http://openocd.sourceforge.net/doc/doxygen/bugs.html"
+		"http://openocd.org/doc/doxygen/bugs.html"
 		"\n");
 
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
diff --git a/tcl/target/amdm37x.cfg b/tcl/target/amdm37x.cfg
index 07e6d102b..59fbbf01c 100644
--- a/tcl/target/amdm37x.cfg
+++ b/tcl/target/amdm37x.cfg
@@ -50,7 +50,7 @@ adapter_khz 10
 ###############################################################################
 # JTAG setup
 # The OpenOCD commands are described in the TAP Declaration section
-#  http://openocd.sourceforge.net/doc/html/TAP-Declaration.html
+#  http://openocd.org/doc/html/TAP-Declaration.html
 ###############################################################################
 
 # The AM/DM37x has an ICEPick module in it like many of TI's other devices. More
@@ -61,7 +61,7 @@ source [find target/icepick.cfg]
 
 # The TAP order should be described from the TDO connection in OpenOCD to the
 #  TDI pin.  The OpenOCD FAQ describes this in more detail:
-#  http://openocd.sourceforge.net/doc/html/FAQ.html
+#  http://openocd.org/doc/html/FAQ.html
 
 # From SPRUGN4R CH27 the available secondary TAPs are in this order from TDO:
 #
@@ -136,7 +136,7 @@ jtag configure $_CHIPNAME.jrc -event setup "jtag tapenable $_CHIPNAME.dap"
 ###############################################################################
 # Target Setup:
 # This section is described in the OpenOCD documentation under CPU Configuration
-#  http://openocd.sourceforge.net/doc/html/CPU-Configuration.html
+#  http://openocd.org/doc/html/CPU-Configuration.html
 ###############################################################################
 
 # Create the CPU target to be used with GDB:  Cortex-A8, using DAP