diff --git a/ChangeLog b/ChangeLog
index fcccfd40f2..c2d5e808b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7465,3 +7465,6 @@
 	  write buffering logic to use I/O buffer chains (not tested on initial
 	  check-in) (2014-6-22).
 
+	* include/time.h and sched/clock_gettime.c:  Fix typo in conditional
+	  compilation:  CONFIG_CLOCK_MONOTONIC vs. CLOCK_MONOTONIC.  From Manuel
+	  Stühn (2014-6-23).
diff --git a/include/time.h b/include/time.h
index e8853ef898..414e199952 100644
--- a/include/time.h
+++ b/include/time.h
@@ -99,7 +99,7 @@
  * system time-of-day clock.
  */
 
-#ifdef CLOCK_MONOTONIC
+#ifdef CONFIG_CLOCK_MONOTONIC
 #  define CLOCK_MONOTONIC  2
 #endif
 
diff --git a/sched/clock_gettime.c b/sched/clock_gettime.c
index ebc06548d0..c7beb8295e 100644
--- a/sched/clock_gettime.c
+++ b/sched/clock_gettime.c
@@ -107,7 +107,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
   sdbg("clock_id=%d\n", clock_id);
   DEBUGASSERT(tp != NULL);
 
-#ifdef CLOCK_MONOTONIC
+#ifdef CONFIG_CLOCK_MONOTONIC
   /* CLOCK_MONOTONIC is an optional under POSIX: "If the Monotonic Clock
    * option is supported, all implementations shall support a clock_id
    * of CLOCK_MONOTONIC defined in <time.h>. This clock represents the