diff --git a/pyopencl/c_wrapper/wrap_cl_core.h b/pyopencl/c_wrapper/wrap_cl_core.h
index 84da8e4229718589b84d83cd27194ee676244980..6f707c64362b0cb6a8714a9d2ccc3b6059ac1afc 100644
--- a/pyopencl/c_wrapper/wrap_cl_core.h
+++ b/pyopencl/c_wrapper/wrap_cl_core.h
@@ -135,6 +135,8 @@ error *enqueue_marker_with_wait_list(clobj_t *event, clobj_t queue,
 error *enqueue_barrier_with_wait_list(clobj_t *event, clobj_t queue,
                                       const clobj_t *wait_for,
                                       uint32_t num_wait_for);
+error *enqueue_wait_for_events(clobj_t _queue, const clobj_t *_wait_for,
+                               uint32_t num_wait_for);
 error *enqueue_marker(clobj_t *event, clobj_t queue);
 error *enqueue_barrier(clobj_t queue);
 
diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index 835a7027f62149f733032dfb94ad39b32f9061c0..2f5227834c7a5f452d912dd6e1f699ef24800e69 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -704,9 +704,6 @@ class NannyEvent(Event):
         return _find_obj(_lib.nanny_event__get_ward(self.ptr))
 
 # TODO
-#   NannyEvent
-#   wait_for_events
-#   enqueue_wait_for_events
 #   UserEvent
 #   enqueue_migrate_mem_objects
 #   enqueue_migrate_mem_objects_ext
@@ -812,6 +809,15 @@ def _enqueue_barrier(queue):
 
 # }}}
 
+# {{{ _enqueue_wait_for_events
+
+def _enqueue_wait_for_events(queue, wait_for=None):
+    c_wait_for, num_wait_for = _clobj_list(wait_for)
+    _handle_error(_lib.enqueue_wait_for_events(queue.ptr, c_wait_for,
+                                               num_wait_for))
+
+# }}}
+
 # {{{ _enqueue_*_buffer
 
 def _enqueue_read_buffer(queue, mem, hostbuf, device_offset=0,
diff --git a/src/c_wrapper/wrap_cl.cpp b/src/c_wrapper/wrap_cl.cpp
index 3f7fa288fb012e827d6777719aeb25ff2a39187b..894642d30bbca0b5b979b6cb7f0e1ea5bf2299de 100644
--- a/src/c_wrapper/wrap_cl.cpp
+++ b/src/c_wrapper/wrap_cl.cpp
@@ -2418,6 +2418,18 @@ enqueue_barrier_with_wait_list(clobj_t *_evt, clobj_t _queue,
 }
 #endif
 
+error*
+enqueue_wait_for_events(clobj_t _queue, const clobj_t *_wait_for,
+                        uint32_t num_wait_for)
+{
+    auto queue = static_cast<command_queue*>(_queue);
+    auto wait_for = buf_from_class<event>(_wait_for, num_wait_for);
+    return c_handle_error([&] {
+            pyopencl_call_guarded(clEnqueueWaitForEvents, queue->data(),
+                                  num_wait_for, wait_for.get());
+        });
+}
+
 error*
 enqueue_marker(clobj_t *_evt, clobj_t _queue)
 {