diff --git a/ChangeLog b/ChangeLog
index 4bd2b421d1fedeaa34b5857e3ecf05b44206c3be..8b33eed64eb1834213c58c24438cfe91c4e02113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1465,6 +1465,6 @@
 	  Dean Camera.
 	* examples/nsh -- Correct an usage of getopt(): If you stop calling getopt()
 	  before all parameters are parsed, you can leave getopt() in a strange state.
-
+	* Rename arch/pjrc-8051 to arch/8051
 
 
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 75b9a0040e77dbcc1da3345d716282caf34b422e..897aa4887592cbaff41ff85d2327076305f804c1 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: February 21, 2011</p>
+      <p>Last Updated: February 24, 2011</p>
     </td>
   </tr>
 </table>
@@ -2042,6 +2042,7 @@ nuttx-5.18 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
       Dean Camera.
 	* examples/nsh -- Correct an usage of getopt(): If you stop calling getopt()
 	  before all parameters are parsed, you can leave getopt() in a strange state.
+    * Rename arch/pjrc-8051 to arch/8051
 
 pascal-2.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 8b4e1264b9429186b2a17d31931579e26fd98fd8..6c9de941fb0e26959dbc5c60923ed04af295063e 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: February 14, 2011</p>
+      <p>Last Updated: February 24, 2011</p>
     </td>
   </tr>
 </table>
@@ -468,7 +468,7 @@
     A work in progress.
   </li>
 
-  <li><code>arch/pjrc-8051</code>:
+  <li><code>arch/8051</code>:
     8051 Microcontroller.  This port is not quite ready for prime time.
   </li>
 
diff --git a/Documentation/README.html b/Documentation/README.html
index e73ee6ad90fc4cacfe264d9105ede1dbac28c5b6..47686f86a52763f7c04551dc44af0eddcc6484f6 100755
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -9,7 +9,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX README Files</i></font></big></h1>
-      <p>Last Updated: November 5, 2010</p>
+      <p>Last Updated: February 24, 2010</p>
     </td>
   </tr>
 </table>
diff --git a/TODO b/TODO
index 374a0ad4f393c056af45e8c64cb843e08ab29e84..438dc460371b48c01e04283d80db411ddbf7729e 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated February 11, 2011)
+NuttX TODO List (Last updated February 24, 2011)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   (5)  Task/Scheduler (sched/)
@@ -16,7 +16,7 @@ NuttX TODO List (Last updated February 11, 2011)
   (2)  Graphics subystem (graphics/)
   (1)  Pascal add-on (pcode/)
   (1)  Documentation (Documentation/)
-  (6)  Build system / Toolchains
+  (5)  Build system / Toolchains
   (4)  NuttShell (NSH) (examples/nsh)
   (3)  Other Applications & Tests (examples/)
   (5)  Linux/Cywgin simulation (arch/sim)
@@ -30,7 +30,7 @@ NuttX TODO List (Last updated February 11, 2011)
   (3)  ARM/STR71x (arch/arm/src/str71x/)
   (4)  ARM/LM3S6918 (arch/arm/src/lm3s/)
   (5)  ARM/STM32 (arch/arm/src/stm32/)
-  (4)  pjrc-8052 / MCS51 (arch/pjrc-8051/)
+  (4)  8051 / MCS51 (arch/8051/)
   (2)  Hitachi/Renesas SH-1 (arch/sh/src/sh1)
   (4)  Renesas M16C/26 (arch/sh/src/m16c)
   (8)  z80/z8/ez80 (arch/z80/)
@@ -490,11 +490,6 @@ o Documentation (Documentation/)
 o Build system
   ^^^^^^^^^^^^
 
-  Description: Some names under arch are still incorrect.  These should be
-               processor architecture names:  pjrc-8051 should be 805x
-  Status:      Open
-  Priority:    Low
-
   Description: configs/pjrc-8051 should be configs/pjrc-87c52
   Status:      Open
   Priority:    Low
@@ -882,8 +877,8 @@ o ARM/STM32 (arch/arm/src/stm32/)
   Priority:    Uncertain.  I don't this is a bug, I think I just don't understand
                how to work with this type of SD card.
 
-o pjrc-8052 / MCS51 (arch/pjrc-8051/)
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+o 8051 / MCS51 (arch/8051/)
+  ^^^^^^^^^^^^^^^^^^^^^^^^^
 
   Description: Current status:
                - Basic OS task management seems OK
diff --git a/arch/pjrc-8051/include/arch.h b/arch/8051/include/arch.h
similarity index 100%
rename from arch/pjrc-8051/include/arch.h
rename to arch/8051/include/arch.h
diff --git a/arch/pjrc-8051/include/irq.h b/arch/8051/include/irq.h
similarity index 100%
rename from arch/pjrc-8051/include/irq.h
rename to arch/8051/include/irq.h
diff --git a/arch/pjrc-8051/include/limits.h b/arch/8051/include/limits.h
similarity index 92%
rename from arch/pjrc-8051/include/limits.h
rename to arch/8051/include/limits.h
index fa93f188c1cabcafa28e8346a630e14f029e9d1c..3344a8d2d9fc9d2b63c2ae793f1d32c6458acf64 100644
--- a/arch/pjrc-8051/include/limits.h
+++ b/arch/8051/include/limits.h
@@ -1,7 +1,7 @@
 /************************************************************
- * arch/pjrc-8051/include/limits.h
+ * arch/8051/include/limits.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ************************************************************/
 
-#ifndef __ARCH_PJRC8051_INCLUDE_LIMITS_H 
-#define __ARCH_PJRC8051_INCLUDE_LIMITS_H 
+#ifndef __ARCH_8051_INCLUDE_LIMITS_H 
+#define __ARCH_8051_INCLUDE_LIMITS_H 
 
 /************************************************************
  * Included Files
@@ -76,4 +76,4 @@
 #define PTR_MAX     0x7fffff
 #define UPTR_MAX    0xffffff
 
-#endif /* __ARCH_PJRC8051_INCLUDE_LIMITS_H  */
+#endif /* __ARCH_8051_INCLUDE_LIMITS_H  */
diff --git a/arch/pjrc-8051/include/types.h b/arch/8051/include/types.h
similarity index 94%
rename from arch/pjrc-8051/include/types.h
rename to arch/8051/include/types.h
index 45141634c1e6f78ecb632e51caf66ef29f63f6d0..7495513b2cb2818c291ecf1a542e426792b0be91 100644
--- a/arch/pjrc-8051/include/types.h
+++ b/arch/8051/include/types.h
@@ -1,7 +1,7 @@
 /************************************************************************
- * arch/pjrc-8051/include/types.h
+ * arch/8051/include/types.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,8 @@
  * only indirectly through sys/types.h
  */
 
-#ifndef __ARCH_PJRC8051_INCLUDE_TYPES_H 
-#define __ARCH_PJRC8051_INCLUDE_TYPES_H 
+#ifndef __ARCH_8051_INCLUDE_TYPES_H 
+#define __ARCH_8051_INCLUDE_TYPES_H 
 
 /************************************************************************
  * Included Files
@@ -95,4 +95,4 @@ typedef unsigned char      irqstate_t;
  * Global Function Prototypes
  ************************************************************************/
 
-#endif /* __ARCH_PJRC8051_INCLUDE_TYPES_H  */
+#endif /* __ARCH_8051_INCLUDE_TYPES_H  */
diff --git a/arch/pjrc-8051/src/Makefile b/arch/8051/src/Makefile
similarity index 98%
rename from arch/pjrc-8051/src/Makefile
rename to arch/8051/src/Makefile
index d77bf546dd779cc45b9ded4d654076b6edfa608b..9152bfa367700a32b930b1336f91014f7cb2d7c0 100644
--- a/arch/pjrc-8051/src/Makefile
+++ b/arch/8051/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# arch/pjrc-8051/src/Makefile
+# arch/8051/src/Makefile
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/arch/pjrc-8051/src/up_allocateheap.c b/arch/8051/src/up_allocateheap.c
similarity index 100%
rename from arch/pjrc-8051/src/up_allocateheap.c
rename to arch/8051/src/up_allocateheap.c
diff --git a/arch/pjrc-8051/src/up_assert.c b/arch/8051/src/up_assert.c
similarity index 100%
rename from arch/pjrc-8051/src/up_assert.c
rename to arch/8051/src/up_assert.c
diff --git a/arch/pjrc-8051/src/up_blocktask.c b/arch/8051/src/up_blocktask.c
similarity index 100%
rename from arch/pjrc-8051/src/up_blocktask.c
rename to arch/8051/src/up_blocktask.c
diff --git a/arch/pjrc-8051/src/up_debug.c b/arch/8051/src/up_debug.c
similarity index 100%
rename from arch/pjrc-8051/src/up_debug.c
rename to arch/8051/src/up_debug.c
diff --git a/arch/pjrc-8051/src/up_delay.c b/arch/8051/src/up_delay.c
similarity index 100%
rename from arch/pjrc-8051/src/up_delay.c
rename to arch/8051/src/up_delay.c
diff --git a/arch/pjrc-8051/src/up_exit.c b/arch/8051/src/up_exit.c
similarity index 100%
rename from arch/pjrc-8051/src/up_exit.c
rename to arch/8051/src/up_exit.c
diff --git a/arch/pjrc-8051/src/up_head.S b/arch/8051/src/up_head.S
similarity index 100%
rename from arch/pjrc-8051/src/up_head.S
rename to arch/8051/src/up_head.S
diff --git a/arch/pjrc-8051/src/up_idle.c b/arch/8051/src/up_idle.c
similarity index 100%
rename from arch/pjrc-8051/src/up_idle.c
rename to arch/8051/src/up_idle.c
diff --git a/arch/pjrc-8051/src/up_initialize.c b/arch/8051/src/up_initialize.c
similarity index 100%
rename from arch/pjrc-8051/src/up_initialize.c
rename to arch/8051/src/up_initialize.c
diff --git a/arch/pjrc-8051/src/up_initialstate.c b/arch/8051/src/up_initialstate.c
similarity index 100%
rename from arch/pjrc-8051/src/up_initialstate.c
rename to arch/8051/src/up_initialstate.c
diff --git a/arch/pjrc-8051/src/up_internal.h b/arch/8051/src/up_internal.h
similarity index 100%
rename from arch/pjrc-8051/src/up_internal.h
rename to arch/8051/src/up_internal.h
diff --git a/arch/pjrc-8051/src/up_interruptcontext.c b/arch/8051/src/up_interruptcontext.c
similarity index 100%
rename from arch/pjrc-8051/src/up_interruptcontext.c
rename to arch/8051/src/up_interruptcontext.c
diff --git a/arch/pjrc-8051/src/up_irq.c b/arch/8051/src/up_irq.c
similarity index 100%
rename from arch/pjrc-8051/src/up_irq.c
rename to arch/8051/src/up_irq.c
diff --git a/arch/pjrc-8051/src/up_irqtest.c b/arch/8051/src/up_irqtest.c
similarity index 100%
rename from arch/pjrc-8051/src/up_irqtest.c
rename to arch/8051/src/up_irqtest.c
diff --git a/arch/pjrc-8051/src/up_putc.c b/arch/8051/src/up_putc.c
similarity index 100%
rename from arch/pjrc-8051/src/up_putc.c
rename to arch/8051/src/up_putc.c
diff --git a/arch/pjrc-8051/src/up_releasepending.c b/arch/8051/src/up_releasepending.c
similarity index 100%
rename from arch/pjrc-8051/src/up_releasepending.c
rename to arch/8051/src/up_releasepending.c
diff --git a/arch/pjrc-8051/src/up_reprioritizertr.c b/arch/8051/src/up_reprioritizertr.c
similarity index 100%
rename from arch/pjrc-8051/src/up_reprioritizertr.c
rename to arch/8051/src/up_reprioritizertr.c
diff --git a/arch/pjrc-8051/src/up_restorecontext.c b/arch/8051/src/up_restorecontext.c
similarity index 100%
rename from arch/pjrc-8051/src/up_restorecontext.c
rename to arch/8051/src/up_restorecontext.c
diff --git a/arch/pjrc-8051/src/up_savecontext.c b/arch/8051/src/up_savecontext.c
similarity index 100%
rename from arch/pjrc-8051/src/up_savecontext.c
rename to arch/8051/src/up_savecontext.c
diff --git a/arch/pjrc-8051/src/up_timerisr.c b/arch/8051/src/up_timerisr.c
similarity index 100%
rename from arch/pjrc-8051/src/up_timerisr.c
rename to arch/8051/src/up_timerisr.c
diff --git a/arch/pjrc-8051/src/up_unblocktask.c b/arch/8051/src/up_unblocktask.c
similarity index 100%
rename from arch/pjrc-8051/src/up_unblocktask.c
rename to arch/8051/src/up_unblocktask.c
diff --git a/arch/README.txt b/arch/README.txt
index 21296e99442d80e2a79986f0e600a2de871e314f..7ef23b3d39c45a0e1a5bda23e53c58a9f1996e8a 100644
--- a/arch/README.txt
+++ b/arch/README.txt
@@ -253,7 +253,7 @@ arch/sh - SuperH and related Hitachi/Renesas microcontrollers
     arch/sh/include/shs and arch/sh/src/sh1
         Support for the SH-1 processor.
 
-arch/pjrc-8051 - 8051/52 microcontrollers
+arch/8051 - 8051/52 microcontrollers
     8051 Microcontroller.  This port is not quite ready for prime time.
 
 arch/z16 - ZiLOG 16-bit processors
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index 4eeac61142f0058e3a23b45744d9415348e728b2..ad4b41731b5d91ecd2aef934ce57e0dc0ac4c14a 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/pjrc-8051/defconfig
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 # CONFIG_ARCH_BOARD_name - for use in C code
 # CONFIG_ENDIAN_BIG - define if big endian (default is little endian)
 #
-CONFIG_ARCH=pjrc-8051
+CONFIG_ARCH=8051
 CONFIG_ARCH_8051=n
 CONFIG_ARCH_8052=y
 CONFIG_ARCH_BOARD=pjrc-8051