diff --git a/README b/README
index 7e610a8ebda3a669f0e1f9cb3a7eaeaf0420336c..d2f466e6f6fae82b996db8cc8a329932fe23c666 100644
--- a/README
+++ b/README
@@ -212,7 +212,7 @@ board. This allows feature development which is not board- or architecture-
 specific to be undertaken on a native platform. The sandbox is also used to
 run some of U-Boot's tests.
 
-See board/sandbox/README.sandbox for more details.
+See doc/arch/index.rst for more details.
 
 
 Board Initialisation Flow:
diff --git a/arch/sandbox/include/asm/spi.h b/arch/sandbox/include/asm/spi.h
index 9985e3c494922985d5f4f9538c9212dcb62e8bbf..98e1826e2cbcb540ea65f8a1886b20a0d1301039 100644
--- a/arch/sandbox/include/asm/spi.h
+++ b/arch/sandbox/include/asm/spi.h
@@ -1,5 +1,5 @@
 /*
- * Simulate a SPI port and clients (see README.sandbox for details)
+ * Simulate a SPI port and clients (see doc/arch/sandbox.rst for details)
  *
  * Copyright (c) 2011-2013 The Chromium OS Authors.
  * See file CREDITS for list of people who contributed to this
diff --git a/doc/README.gpt b/doc/README.gpt
index 62013a3f89e2ed753915e82f969f98db19df516f..facd7afc3acdb70560096d3cdc417a68b734ae3f 100644
--- a/doc/README.gpt
+++ b/doc/README.gpt
@@ -229,7 +229,7 @@ U-BOOT> gpt rename mmc 0 1 primary
 
 The GPT functionality may be tested with the 'sandbox' board by
 creating a disk image as described under 'Block Device Emulation' in
-board/sandbox/README.sandbox:
+doc/arch/index.rst:
 
 =>host bind 0 ./disk.raw
 => gpt read host 0
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0a1d228a8833a0ca680488d3e31eb77ba0806705..084e09522919b1c46e7627a4d7d992895fdbc48a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -196,7 +196,7 @@ config ETH_SANDBOX_RAW
 	  This driver is a bridge from the bottom of the network stack
 	  in U-Boot to the RAW AF_PACKET API in Linux. This allows real
 	  network traffic to be tested from within sandbox. See
-	  board/sandbox/README.sandbox for more details.
+	  doc/arch/index.rst for more details.
 
 config ETH_DESIGNWARE
 	bool "Synopsys Designware Ethernet MAC"