diff --git a/ChangeLog b/ChangeLog
index 985347a573..636751bb35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5653,3 +5653,8 @@
 	* drivers/net/encx24j600.c:  Removed logic that polls for the
 	  next outgoing packet from the TX done interrupt handling.  From
 	  Max Holtzberg (2013-9-27)
+	* sched/os_start.c:  Should not call group_setupidlefiles() if there
+	  are not file descriptors (and, hence, no file system) (2013-9-27).
+	* arch/arm/src/sama5/sam_gmac.c:  GMAC driver and GMII logic is
+	  code complete and readay for test (2013-9-27)
+
diff --git a/sched/os_start.c b/sched/os_start.c
index 84c61044b7..a7cd4b9f4f 100644
--- a/sched/os_start.c
+++ b/sched/os_start.c
@@ -486,7 +486,9 @@ void os_start(void)
    * inherited by all of the threads created by the IDLE task.
    */
 
+#if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NSOCKET_DESCRIPTORS > 0
   DEBUGVERIFY(group_setupidlefiles(&g_idletcb));
+#endif
 
   /* Complete initialization of the IDLE group.  Suppress retention
    * of child status in the IDLE group.