diff --git a/Documentation/README.html b/Documentation/README.html
index a6d42ccda9b..aeb587dad02 100755
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -22,7 +22,7 @@
 <ul><pre>
  .
  | - nuttx
- |   |
+ |   |- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/README.txt?view=log"><b>README.txt</b></a>
  |   |- arch/
  |   |   |
  |   |   |- arm
@@ -186,8 +186,9 @@
  |   |- syscall/
  |   |   `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/syscall/README.txt?view=log"><b><i>README.txt</i></b></a>
  |   `- tools/
- |       `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/tols/README.txt?view=log"><b><i>README.txt</i></b></a>
+ |       `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/tools/README.txt?view=log"><b><i>README.txt</i></b></a>
  `- apps/
+     |- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/apps/README.txt?view=log"><b>README.txt</b></a>
      |- interpreters/
      |   `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/apps/interpreters/README.txt?view=log"><b><i>README.txt</i></b></a>
      |- netutils/
diff --git a/arch/mips/src/pic32mx/pic32mx-config.h b/arch/mips/src/pic32mx/pic32mx-config.h
index 870775cfd9e..fcf4f3e5a61 100755
--- a/arch/mips/src/pic32mx/pic32mx-config.h
+++ b/arch/mips/src/pic32mx/pic32mx-config.h
@@ -511,7 +511,7 @@
 /* Are any UARTs enabled? */
 
 #undef HAVE_UART_DEVICE
-#if defined(CONFIG_PIC32MX_UART1) || defined(CONFIG_PIC32MX_UART1)
+#if defined(CONFIG_PIC32MX_UART1) || defined(CONFIG_PIC32MX_UART2)
 #  define HAVE_UART_DEVICE 1
 #endif
 
diff --git a/arch/mips/src/pic32mx/pic32mx-lowconsole.c b/arch/mips/src/pic32mx/pic32mx-lowconsole.c
index b3286715d2a..5498e22358d 100644
--- a/arch/mips/src/pic32mx/pic32mx-lowconsole.c
+++ b/arch/mips/src/pic32mx/pic32mx-lowconsole.c
@@ -63,12 +63,12 @@
 #  define PIC32MX_CONSOLE_BITS     CONFIG_UART1_BITS
 #  define PIC32MX_CONSOLE_PARITY   CONFIG_UART1_PARITY
 #  define PIC32MX_CONSOLE_2STOP    CONFIG_UART1_2STOP
-#elif defined(CONFIG_UART_SERIAL_CONSOLE)
-#  define PIC32MX_CONSOLE_BASE     PIC32MX_UART_K1BASE
-#  define PIC32MX_CONSOLE_BAUD     CONFIG_UART_BAUD
-#  define PIC32MX_CONSOLE_BITS     CONFIG_UART_BITS
-#  define PIC32MX_CONSOLE_PARITY   CONFIG_UART_PARITY
-#  define PIC32MX_CONSOLE_2STOP    CONFIG_UART_2STOP
+#elif defined(CONFIG_UART2_SERIAL_CONSOLE)
+#  define PIC32MX_CONSOLE_BASE     PIC32MX_UART2_K1BASE
+#  define PIC32MX_CONSOLE_BAUD     CONFIG_UART2_BAUD
+#  define PIC32MX_CONSOLE_BITS     CONFIG_UART2_BITS
+#  define PIC32MX_CONSOLE_PARITY   CONFIG_UART2_PARITY
+#  define PIC32MX_CONSOLE_2STOP    CONFIG_UART2_2STOP
 #else
 #  error "No CONFIG_UARTn_SERIAL_CONSOLE Setting"
 #endif
diff --git a/configs/sure-pic32mx/src/up_leds.c b/configs/sure-pic32mx/src/up_leds.c
index a885fa6457e..5177eef6a8c 100644
--- a/configs/sure-pic32mx/src/up_leds.c
+++ b/configs/sure-pic32mx/src/up_leds.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "pic32mx_internal.h"
+#include "pic32mx-internal.h"
 #include "sure-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/configs/sure-pic32mx/src/up_nsh.c b/configs/sure-pic32mx/src/up_nsh.c
index d83cfea4cfc..9f2498acef5 100644
--- a/configs/sure-pic32mx/src/up_nsh.c
+++ b/configs/sure-pic32mx/src/up_nsh.c
@@ -49,7 +49,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
 
-#include "pic32mx_internal.h"
+#include "pic32mx-internal.h"
 #include "sure-internal.h"
 
 /****************************************************************************
diff --git a/configs/sure-pic32mx/src/up_spi.c b/configs/sure-pic32mx/src/up_spi.c
index 1fbab931e26..5d03dcb2a2e 100644
--- a/configs/sure-pic32mx/src/up_spi.c
+++ b/configs/sure-pic32mx/src/up_spi.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "pic32mx_internal.h"
+#include "pic32mx-internal.h"
 #include "sure-internal.h"
 
 #if defined(CONFIG_PIC32MX_SPI2)