diff --git a/examples/ostest/Makefile b/examples/ostest/Makefile
index d0f347dfb..71b08a942 100644
--- a/examples/ostest/Makefile
+++ b/examples/ostest/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # apps/examples/ostest/Makefile
 #
-#   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2012, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -69,18 +69,13 @@ endif # CONFIG_DISABLE_PTHREAD
 ifneq ($(CONFIG_DISABLE_SIGNALS),y)
 CSRCS		+= sighand.c
 ifneq ($(CONFIG_DISABLE_PTHREAD),y)
-ifneq ($(CONFIG_DISABLE_CLOCK),y)
 CSRCS		+= timedwait.c
-endif # CONFIG_DISABLE_CLOCK
 endif # CONFIG_DISABLE_PTHREAD
 endif # CONFIG_DISABLE_SIGNALS
 
 ifneq ($(CONFIG_DISABLE_MQUEUE),y)
 ifneq ($(CONFIG_DISABLE_PTHREAD),y)
-CSRCS		+= mqueue.c
-ifneq ($(CONFIG_DISABLE_CLOCK),y)
-CSRCS		+= timedmqueue.c
-endif # CONFIG_DISABLE_CLOCK
+CSRCS		+= mqueue.c timedmqueue.c
 endif # CONFIG_DISABLE_PTHREAD
 endif # CONFIG_DISABLE_MQUEUE
 
diff --git a/examples/ostest/ostest_main.c b/examples/ostest/ostest_main.c
index 8591c5f3f..a234e50e6 100644
--- a/examples/ostest/ostest_main.c
+++ b/examples/ostest/ostest_main.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * apps/examples/ostest/ostest_main.c
  *
- *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -387,7 +387,7 @@ static int user_main(int argc, char *argv[])
 #endif
 #endif
 
-#if !defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_DISABLE_PTHREAD) && !defined(CONFIG_DISABLE_CLOCK)
+#if !defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_DISABLE_PTHREAD)
       /* Verify pthreads and condition variable timed waits */
 
       printf("\nuser_main: timed wait test\n");
@@ -403,7 +403,7 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
-#if !defined(CONFIG_DISABLE_MQUEUE) && !defined(CONFIG_DISABLE_PTHREAD) && !defined(CONFIG_DISABLE_CLOCK)
+#if !defined(CONFIG_DISABLE_MQUEUE) && !defined(CONFIG_DISABLE_PTHREAD)
       /* Verify pthreads and message queues */
 
       printf("\nuser_main: timed message queue test\n");
diff --git a/nshlib/README.txt b/nshlib/README.txt
index a4771679e..821e40027 100644
--- a/nshlib/README.txt
+++ b/nshlib/README.txt
@@ -979,7 +979,7 @@ Command Dependencies on Configuration Settings
   mount      !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_READABLE (see note 3)
   mv         (((!CONFIG_DISABLE_MOUNTPOINT && CONFIG_FS_WRITABLE) || !CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_DESCRIPTORS > 0) (see note 4)
   nfsmount   !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NET && CONFIG_NFS
-  ping       CONFIG_NET && CONFIG_NET_ICMP && CONFIG_NET_ICMP_PING  && !CONFIG_DISABLE_CLOCK && !CONFIG_DISABLE_SIGNALS
+  ping       CONFIG_NET && CONFIG_NET_ICMP && CONFIG_NET_ICMP_PING && !CONFIG_DISABLE_SIGNALS
   ps         --
   put        CONFIG_NET && CONFIG_NET_UDP && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NET_BUFSIZE >= 558 (see note 1,2)
   pwd        !CONFIG_DISABLE_ENVIRON && CONFIG_NFILE_DESCRIPTORS > 0
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 245690517..bff96dc1c 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -787,10 +787,8 @@ void nsh_usbtrace(void);
   int cmd_lbracket(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif
 
-#ifndef CONFIG_DISABLE_CLOCK
-#  if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
-   int cmd_date(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
-#  endif
+#if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
+  int cmd_date(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -906,7 +904,7 @@ void nsh_usbtrace(void);
 #    endif
 #  endif
 #  if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
-     !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
+     !defined(CONFIG_DISABLE_SIGNALS)
 #    ifndef CONFIG_NSH_DISABLE_PING
         int cmd_ping(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #    endif
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 2c043aa5c..ef141b80a 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -140,7 +140,7 @@ static const struct cmdmap_s g_cmdmap[] =
 # endif
 #endif
 
-#if defined (CONFIG_RTC) && !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_NSH_DISABLE_DATE)
+#if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
   { "date",     cmd_date,     1, 3, "[-s \"MMM DD HH:MM:SS YYYY\"]" },
 #endif
 
@@ -317,8 +317,7 @@ static const struct cmdmap_s g_cmdmap[] =
 #  endif
 #endif
 
-#if defined(CONFIG_NET) && defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
-   !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
+#if defined(CONFIG_NET) && defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && !defined(CONFIG_DISABLE_SIGNALS)
 # ifndef CONFIG_NSH_DISABLE_PING
   { "ping",     cmd_ping,     2, 6, "[-c <count>] [-i <interval>] <ip-address>" },
 # endif
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 93ed13237..f70d88e3e 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -66,7 +66,7 @@
 #include <nuttx/net/ip.h>
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
-   !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
+   !defined(CONFIG_DISABLE_SIGNALS)
 #  include <apps/netutils/netlib.h>
 #  include <apps/netutils/dnsclient.h>
 #endif
@@ -133,7 +133,7 @@ struct tftpc_args_s
  ****************************************************************************/
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
-   !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
+   !defined(CONFIG_DISABLE_SIGNALS)
 static uint16_t g_pingid = 0;
 #endif
 
@@ -150,7 +150,7 @@ static uint16_t g_pingid = 0;
  ****************************************************************************/
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
-   !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
+   !defined(CONFIG_DISABLE_SIGNALS)
 static inline uint16_t ping_newid(void)
 {
   irqstate_t save = irqsave();
@@ -837,7 +837,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
  ****************************************************************************/
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
-   !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
+   !defined(CONFIG_DISABLE_SIGNALS)
 #ifndef CONFIG_NSH_DISABLE_PING
 int cmd_ping(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
diff --git a/nshlib/nsh_timcmds.c b/nshlib/nsh_timcmds.c
index bc2bda6f4..3fa1a06b6 100644
--- a/nshlib/nsh_timcmds.c
+++ b/nshlib/nsh_timcmds.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * apps/nshlib/dbg_timcmds.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
  * Private Data
  ****************************************************************************/
 
-#if defined (CONFIG_RTC) && !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_NSH_DISABLE_DATE)
+#if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
 static FAR const char * const g_datemontab[] =
 {
   "jan", "feb", "mar", "apr", "may", "jun",
@@ -85,7 +85,7 @@ static FAR const char * const g_datemontab[] =
  * Name: date_month
  ****************************************************************************/
 
-#if defined (CONFIG_RTC) && !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_NSH_DISABLE_DATE)
+#if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
 static inline int date_month(FAR const char *abbrev)
 {
   int i;
@@ -105,7 +105,7 @@ static inline int date_month(FAR const char *abbrev)
  * Name: date_gettime
  ****************************************************************************/
 
-#if defined (CONFIG_RTC) && !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_NSH_DISABLE_DATE)
+#if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
 static inline int date_showtime(FAR struct nsh_vtbl_s *vtbl, FAR const char *name)
 {
   static const char format[] = "%b %d %H:%M:%S %Y";
@@ -139,7 +139,7 @@ static inline int date_showtime(FAR struct nsh_vtbl_s *vtbl, FAR const char *nam
  * Name: date_settime
  ****************************************************************************/
 
-#if defined (CONFIG_RTC) && !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_NSH_DISABLE_DATE)
+#if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
 static inline int date_settime(FAR struct nsh_vtbl_s *vtbl, FAR const char *name,
                                FAR char *newtime)
 {
@@ -267,7 +267,7 @@ errout_bad_parm:
  * Name: cmd_date
  ****************************************************************************/
 
-#if defined (CONFIG_RTC) && !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_NSH_DISABLE_DATE)
+#if defined (CONFIG_RTC) && !defined(CONFIG_NSH_DISABLE_DATE)
 int cmd_date(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
   FAR char *newtime = NULL;