diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 67b3eb4a94eb..611d43ac1bbb 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-25  Mike Crowe  <mac@mcrowe.com>
+
+	* include/std/condition_variable (condition_variable::wait_for): Use
+	steady clock in overload that uses a predicate.
+
 2018-09-25  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/87431
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index 1f84ea324ebb..84173012b5b0 100644
--- a/libstdc++-v3/include/std/condition_variable
+++ b/libstdc++-v3/include/std/condition_variable
@@ -158,11 +158,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	       const chrono::duration<_Rep, _Period>& __rtime,
 	       _Predicate __p)
       {
-	using __dur = typename __clock_t::duration;
+	using __dur = typename __steady_clock_t::duration;
 	auto __reltime = chrono::duration_cast<__dur>(__rtime);
 	if (__reltime < __rtime)
 	  ++__reltime;
-	return wait_until(__lock, __clock_t::now() + __reltime, std::move(__p));
+	return wait_until(__lock, __steady_clock_t::now() + __reltime,
+			  std::move(__p));
       }
 
     native_handle_type