diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 6df66b95fc..b7b71862ec 100755
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -323,3 +323,6 @@
 	  by Max Holtzberg.
 	* apps/examples/discover:  A test example for the UDP network discovery
 	  utility (also contribed by Max Holtzberg).
+	* apps/examples/*/main.c:  Too many files called main.c.  Each renamed
+	  to something unique so that they will not collide in the archive.
+
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 8a7a94c3e4..934eded4d8 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -1133,7 +1133,7 @@ examples/rgmp
 
   See http://rgmp.sourceforge.net/wiki/index.php/Main_Page for further
 
-  At present, the RGMP example folder contains only an empty main.c file.
+  At present, the RGMP example folder contains only an empty rgmp_main.c file.
 
 examples/romfs
 ^^^^^^^^^^^^^^
diff --git a/apps/examples/buttons/Makefile b/apps/examples/buttons/Makefile
index 9c05871998..a9d7bf5835 100644
--- a/apps/examples/buttons/Makefile
+++ b/apps/examples/buttons/Makefile
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # Hello, World! Example
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= buttons_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/buttons/main.c b/apps/examples/buttons/buttons_main.c
similarity index 99%
rename from apps/examples/buttons/main.c
rename to apps/examples/buttons/buttons_main.c
index 50124512cd..a3f6449d4f 100644
--- a/apps/examples/buttons/main.c
+++ b/apps/examples/buttons/buttons_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/buttons/main.c
+ * examples/buttons/buttons_main.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/apps/examples/discover/Makefile b/apps/examples/discover/Makefile
index f42f310a11..3bb6b939eb 100644
--- a/apps/examples/discover/Makefile
+++ b/apps/examples/discover/Makefile
@@ -47,7 +47,7 @@ PRIORITY	= SCHED_PRIORITY_DEFAULT
 STACKSIZE	= 2048
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= discover_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/discover/main.c b/apps/examples/discover/discover_main.c
similarity index 99%
rename from apps/examples/discover/main.c
rename to apps/examples/discover/discover_main.c
index d076deb11f..c3acb56df3 100644
--- a/apps/examples/discover/main.c
+++ b/apps/examples/discover/discover_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/discover/main.c
+ * examples/discover/discover_main.c
  *
  *   Copyright (C) 2012 Max Holtzberg. All rights reserved.
  *   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile
index 9c3cda894b..1d78d723ed 100644
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@@ -46,7 +46,7 @@ STACKSIZE	= 2048
 # Hello, World! Example
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= hello_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/hello/main.c b/apps/examples/hello/hello_main.c
similarity index 98%
rename from apps/examples/hello/main.c
rename to apps/examples/hello/hello_main.c
index 7e07cffd13..229027c36b 100644
--- a/apps/examples/hello/main.c
+++ b/apps/examples/hello/hello_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/hello/main.c
+ * examples/hello/hello_main.c
  *
  *   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/apps/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile
index c34378d249..c9557d124b 100644
--- a/apps/examples/helloxx/Makefile
+++ b/apps/examples/helloxx/Makefile
@@ -41,7 +41,7 @@ include $(APPDIR)/Make.defs
 
 ASRCS		=
 CSRCS		=
-CXXSRCS		= main.cxx
+CXXSRCS		= helloxx_main.cxx
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/helloxx/main.cxx b/apps/examples/helloxx/helloxx_main.cxx
similarity index 99%
rename from apps/examples/helloxx/main.cxx
rename to apps/examples/helloxx/helloxx_main.cxx
index fcec7c761a..60fd0487b5 100644
--- a/apps/examples/helloxx/main.cxx
+++ b/apps/examples/helloxx/helloxx_main.cxx
@@ -1,5 +1,5 @@
 //***************************************************************************
-// examples/helloxx/main.cxx
+// examples/helloxx/helloxx_main.cxx
 //
 //   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile
index eab1db8b39..374964b396 100644
--- a/apps/examples/ostest/Makefile
+++ b/apps/examples/ostest/Makefile
@@ -46,7 +46,7 @@ STACKSIZE	= 2048
 # NuttX OS Test
 
 ASRCS		=
-CSRCS		= main.c dev_null.c
+CSRCS		= ostest_main.c dev_null.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
 CSRCS		+= fpu.c
diff --git a/apps/examples/ostest/main.c b/apps/examples/ostest/ostest_main.c
similarity index 99%
rename from apps/examples/ostest/main.c
rename to apps/examples/ostest/ostest_main.c
index 61a2af19a6..46726d515d 100644
--- a/apps/examples/ostest/main.c
+++ b/apps/examples/ostest/ostest_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/examples/ostest/main.c
+ * apps/examples/ostest/ostest_main.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/apps/examples/rgmp/Makefile b/apps/examples/rgmp/Makefile
index cefe63d54b..60fbf7c682 100644
--- a/apps/examples/rgmp/Makefile
+++ b/apps/examples/rgmp/Makefile
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # The smallest thing you can build -- the NULL example.
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= rgmp_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/rgmp/main.c b/apps/examples/rgmp/rgmp_main.c
similarity index 98%
rename from apps/examples/rgmp/main.c
rename to apps/examples/rgmp/rgmp_main.c
index a1fa6cdc39..3ef70edc8c 100644
--- a/apps/examples/rgmp/main.c
+++ b/apps/examples/rgmp/rgmp_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/rgmp/main.c
+ * examples/rgmp/rgmp_main.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/apps/examples/serloop/Makefile b/apps/examples/serloop/Makefile
index 67c805d46c..7594779ce9 100644
--- a/apps/examples/serloop/Makefile
+++ b/apps/examples/serloop/Makefile
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # Mindlessly simple console loopack test
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= serloop_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/serloop/main.c b/apps/examples/serloop/serloop_main.c
similarity index 98%
rename from apps/examples/serloop/main.c
rename to apps/examples/serloop/serloop_main.c
index f0e3ac2387..6fba577a4c 100644
--- a/apps/examples/serloop/main.c
+++ b/apps/examples/serloop/serloop_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/serloop/main.c
+ * examples/serloop/serloop_main.c
  *
  *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/apps/examples/thttpd/Makefile b/apps/examples/thttpd/Makefile
index 9df26af359..606e717dc4 100644
--- a/apps/examples/thttpd/Makefile
+++ b/apps/examples/thttpd/Makefile
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # THTTPD Web Server Example
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= thttpd_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/thttpd/main.c b/apps/examples/thttpd/thttpd_main.c
similarity index 99%
rename from apps/examples/thttpd/main.c
rename to apps/examples/thttpd/thttpd_main.c
index 4f8315d959..f4d5d58db4 100644
--- a/apps/examples/thttpd/main.c
+++ b/apps/examples/thttpd/thttpd_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/thttpd/main.c
+ * examples/thttpd/thttpd_main.c
  *
  *   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/apps/examples/uip/Makefile b/apps/examples/uip/Makefile
index 4407998fc7..218f6f3c60 100644
--- a/apps/examples/uip/Makefile
+++ b/apps/examples/uip/Makefile
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # uIP very tiny web server example
 
 ASRCS		=
-CSRCS		= main.c cgi.c httpd_fsdata.c
+CSRCS		= uip_main.c cgi.c httpd_fsdata.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/uip/main.c b/apps/examples/uip/uip_main.c
similarity index 98%
rename from apps/examples/uip/main.c
rename to apps/examples/uip/uip_main.c
index dcad63eaa5..b552aed75a 100644
--- a/apps/examples/uip/main.c
+++ b/apps/examples/uip/uip_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/uip/main.c
+ * examples/uip/uip_main.c
  *
  *   Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -201,7 +201,7 @@ int uip_main(int argc, char *argv[])
   while(1)
     {
       sleep(3);
-      printf("main: Still running\n");
+      printf("uip_main: Still running\n");
 #if CONFIG_NFILE_DESCRIPTORS > 0
       fflush(stdout);
 #endif
diff --git a/apps/examples/usbserial/Makefile b/apps/examples/usbserial/Makefile
index 35c76ba896..cf790dbe9d 100644
--- a/apps/examples/usbserial/Makefile
+++ b/apps/examples/usbserial/Makefile
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # USB serial device example
 
 ASRCS		=
-CSRCS		=  main.c
+CSRCS		=  usbserial_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/apps/examples/usbserial/main.c b/apps/examples/usbserial/usbserial_main.c
similarity index 99%
rename from apps/examples/usbserial/main.c
rename to apps/examples/usbserial/usbserial_main.c
index c73881a44d..016c8b292c 100644
--- a/apps/examples/usbserial/main.c
+++ b/apps/examples/usbserial/usbserial_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/usbserial/main.c
+ * examples/usbserial/usbserial_main.c
  *
  *   Copyright (C) 2008, 2010-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/apps/netutils/discover/discover.c b/apps/netutils/discover/discover.c
index 67df02b3f7..8e2612dbb6 100644
--- a/apps/netutils/discover/discover.c
+++ b/apps/netutils/discover/discover.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/discover/main.c
+ * netutils/discover/discover.c
  *
  *   Copyright (C) 2012 Max Holtzberg. All rights reserved.
  *   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
diff --git a/apps/system/i2c/README.txt b/apps/system/i2c/README.txt
index 97801bcaaa..7b432533be 100755
--- a/apps/system/i2c/README.txt
+++ b/apps/system/i2c/README.txt
@@ -211,7 +211,7 @@ COMMAND SUMMARY
 ===============
 
 We have already seen the I2C help (or ?) commands above.  This section will
-discusse the remaining commands.
+discuss the remaining commands.
 
 List buses: bus [OPTIONS]
 --------------------------