asio version 1.8.0 released
diff --git a/asio/README b/asio/README
index 75893d5..2e26369 100644
--- a/asio/README
+++ b/asio/README
@@ -1,4 +1,4 @@
-asio version 1.6.1
-Released Tuesday, 22 May 2012.
+asio version 1.8.0
+Released Wednesday, 23 May 2012.
 
 See doc/index.html for API documentation and a tutorial.
diff --git a/asio/asio.manifest b/asio/asio.manifest
index 6b7c3f9..6216c39 100644
--- a/asio/asio.manifest
+++ b/asio/asio.manifest
@@ -28,6 +28,7 @@
 /doc/asio/overview/cpp2011/
 /doc/asio/overview/cpp2011/array.html
 /doc/asio/overview/cpp2011/atomic.html
+/doc/asio/overview/cpp2011/chrono.html
 /doc/asio/overview/cpp2011.html
 /doc/asio/overview/cpp2011/move_handlers.html
 /doc/asio/overview/cpp2011/move_objects.html
@@ -53,6 +54,7 @@
 /doc/asio/overview/timers.html
 /doc/asio/overview/windows/
 /doc/asio/overview/windows.html
+/doc/asio/overview/windows/object_handle.html
 /doc/asio/overview/windows/random_access_handle.html
 /doc/asio/overview/windows/stream_handle.html
 /doc/asio.png
@@ -1284,6 +1286,53 @@
 /doc/asio/reference/basic_stream_socket/write_some.html
 /doc/asio/reference/basic_stream_socket/write_some/overload1.html
 /doc/asio/reference/basic_stream_socket/write_some/overload2.html
+/doc/asio/reference/basic_waitable_timer/
+/doc/asio/reference/basic_waitable_timer/async_wait.html
+/doc/asio/reference/basic_waitable_timer/basic_waitable_timer/
+/doc/asio/reference/basic_waitable_timer/basic_waitable_timer.html
+/doc/asio/reference/basic_waitable_timer/basic_waitable_timer/overload1.html
+/doc/asio/reference/basic_waitable_timer/basic_waitable_timer/overload2.html
+/doc/asio/reference/basic_waitable_timer/basic_waitable_timer/overload3.html
+/doc/asio/reference/basic_waitable_timer/cancel/
+/doc/asio/reference/basic_waitable_timer/cancel.html
+/doc/asio/reference/basic_waitable_timer/cancel_one/
+/doc/asio/reference/basic_waitable_timer/cancel_one.html
+/doc/asio/reference/basic_waitable_timer/cancel_one/overload1.html
+/doc/asio/reference/basic_waitable_timer/cancel_one/overload2.html
+/doc/asio/reference/basic_waitable_timer/cancel/overload1.html
+/doc/asio/reference/basic_waitable_timer/cancel/overload2.html
+/doc/asio/reference/basic_waitable_timer/clock_type.html
+/doc/asio/reference/basic_waitable_timer/duration.html
+/doc/asio/reference/basic_waitable_timer/expires_at/
+/doc/asio/reference/basic_waitable_timer/expires_at.html
+/doc/asio/reference/basic_waitable_timer/expires_at/overload1.html
+/doc/asio/reference/basic_waitable_timer/expires_at/overload2.html
+/doc/asio/reference/basic_waitable_timer/expires_at/overload3.html
+/doc/asio/reference/basic_waitable_timer/expires_from_now/
+/doc/asio/reference/basic_waitable_timer/expires_from_now.html
+/doc/asio/reference/basic_waitable_timer/expires_from_now/overload1.html
+/doc/asio/reference/basic_waitable_timer/expires_from_now/overload2.html
+/doc/asio/reference/basic_waitable_timer/expires_from_now/overload3.html
+/doc/asio/reference/basic_waitable_timer/get_implementation/
+/doc/asio/reference/basic_waitable_timer/get_implementation.html
+/doc/asio/reference/basic_waitable_timer/get_implementation/overload1.html
+/doc/asio/reference/basic_waitable_timer/get_implementation/overload2.html
+/doc/asio/reference/basic_waitable_timer/get_io_service.html
+/doc/asio/reference/basic_waitable_timer/get_service/
+/doc/asio/reference/basic_waitable_timer/get_service.html
+/doc/asio/reference/basic_waitable_timer/get_service/overload1.html
+/doc/asio/reference/basic_waitable_timer/get_service/overload2.html
+/doc/asio/reference/basic_waitable_timer.html
+/doc/asio/reference/basic_waitable_timer/implementation.html
+/doc/asio/reference/basic_waitable_timer/implementation_type.html
+/doc/asio/reference/basic_waitable_timer/service.html
+/doc/asio/reference/basic_waitable_timer/service_type.html
+/doc/asio/reference/basic_waitable_timer/time_point.html
+/doc/asio/reference/basic_waitable_timer/traits_type.html
+/doc/asio/reference/basic_waitable_timer/wait/
+/doc/asio/reference/basic_waitable_timer/wait.html
+/doc/asio/reference/basic_waitable_timer/wait/overload1.html
+/doc/asio/reference/basic_waitable_timer/wait/overload2.html
 /doc/asio/reference/buffer/
 /doc/asio/reference/buffer_cast/
 /doc/asio/reference/buffer_cast.html
@@ -1694,6 +1743,7 @@
 /doc/asio/reference/HandleService.html
 /doc/asio/reference/HandshakeHandler.html
 /doc/asio/reference/has_service.html
+/doc/asio/reference/high_resolution_timer.html
 /doc/asio/reference.html
 /doc/asio/reference/InternetProtocol.html
 /doc/asio/reference/invalid_service_owner/
@@ -2178,6 +2228,7 @@
 /doc/asio/reference/null_buffers/end.html
 /doc/asio/reference/null_buffers.html
 /doc/asio/reference/null_buffers/value_type.html
+/doc/asio/reference/ObjectHandleService.html
 /doc/asio/reference/operator_lt__lt_.html
 /doc/asio/reference/placeholders__bytes_transferred.html
 /doc/asio/reference/placeholders__error.html
@@ -2782,6 +2833,7 @@
 /doc/asio/reference/ssl__verify_mode.html
 /doc/asio/reference/ssl__verify_none.html
 /doc/asio/reference/ssl__verify_peer.html
+/doc/asio/reference/steady_timer.html
 /doc/asio/reference/strand.html
 /doc/asio/reference/streambuf.html
 /doc/asio/reference/StreamDescriptorService.html
@@ -2847,6 +2899,7 @@
 /doc/asio/reference/system_error/system_error/overload2.html
 /doc/asio/reference/system_error/system_error/overload3.html
 /doc/asio/reference/system_error/what.html
+/doc/asio/reference/system_timer.html
 /doc/asio/reference/thread/
 /doc/asio/reference/thread.html
 /doc/asio/reference/thread/join.html
@@ -2867,7 +2920,36 @@
 /doc/asio/reference/transfer_at_least.html
 /doc/asio/reference/transfer_exactly.html
 /doc/asio/reference/use_service.html
+/doc/asio/reference/waitable_timer_service/
+/doc/asio/reference/waitable_timer_service/async_wait.html
+/doc/asio/reference/waitable_timer_service/cancel.html
+/doc/asio/reference/waitable_timer_service/cancel_one.html
+/doc/asio/reference/waitable_timer_service/clock_type.html
+/doc/asio/reference/waitable_timer_service/construct.html
+/doc/asio/reference/waitable_timer_service/destroy.html
+/doc/asio/reference/waitable_timer_service/duration.html
+/doc/asio/reference/waitable_timer_service/expires_at/
+/doc/asio/reference/waitable_timer_service/expires_at.html
+/doc/asio/reference/waitable_timer_service/expires_at/overload1.html
+/doc/asio/reference/waitable_timer_service/expires_at/overload2.html
+/doc/asio/reference/waitable_timer_service/expires_from_now/
+/doc/asio/reference/waitable_timer_service/expires_from_now.html
+/doc/asio/reference/waitable_timer_service/expires_from_now/overload1.html
+/doc/asio/reference/waitable_timer_service/expires_from_now/overload2.html
+/doc/asio/reference/waitable_timer_service/get_io_service.html
+/doc/asio/reference/WaitableTimerService.html
+/doc/asio/reference/waitable_timer_service.html
+/doc/asio/reference/waitable_timer_service/id.html
+/doc/asio/reference/waitable_timer_service/implementation_type.html
+/doc/asio/reference/waitable_timer_service/time_point.html
+/doc/asio/reference/waitable_timer_service/traits_type.html
+/doc/asio/reference/waitable_timer_service/waitable_timer_service.html
+/doc/asio/reference/waitable_timer_service/wait.html
 /doc/asio/reference/WaitHandler.html
+/doc/asio/reference/wait_traits/
+/doc/asio/reference/WaitTraits.html
+/doc/asio/reference/wait_traits.html
+/doc/asio/reference/wait_traits/to_wait_duration.html
 /doc/asio/reference/windows__basic_handle/
 /doc/asio/reference/windows__basic_handle/assign/
 /doc/asio/reference/windows__basic_handle/assign.html
@@ -2912,6 +2994,54 @@
 /doc/asio/reference/windows__basic_handle/operator_eq_.html
 /doc/asio/reference/windows__basic_handle/service.html
 /doc/asio/reference/windows__basic_handle/service_type.html
+/doc/asio/reference/windows__basic_object_handle/
+/doc/asio/reference/windows__basic_object_handle/assign/
+/doc/asio/reference/windows__basic_object_handle/assign.html
+/doc/asio/reference/windows__basic_object_handle/assign/overload1.html
+/doc/asio/reference/windows__basic_object_handle/assign/overload2.html
+/doc/asio/reference/windows__basic_object_handle/async_wait.html
+/doc/asio/reference/windows__basic_object_handle/basic_object_handle/
+/doc/asio/reference/windows__basic_object_handle/basic_object_handle.html
+/doc/asio/reference/windows__basic_object_handle/basic_object_handle/overload1.html
+/doc/asio/reference/windows__basic_object_handle/basic_object_handle/overload2.html
+/doc/asio/reference/windows__basic_object_handle/basic_object_handle/overload3.html
+/doc/asio/reference/windows__basic_object_handle/cancel/
+/doc/asio/reference/windows__basic_object_handle/cancel.html
+/doc/asio/reference/windows__basic_object_handle/cancel/overload1.html
+/doc/asio/reference/windows__basic_object_handle/cancel/overload2.html
+/doc/asio/reference/windows__basic_object_handle/close/
+/doc/asio/reference/windows__basic_object_handle/close.html
+/doc/asio/reference/windows__basic_object_handle/close/overload1.html
+/doc/asio/reference/windows__basic_object_handle/close/overload2.html
+/doc/asio/reference/windows__basic_object_handle/get_implementation/
+/doc/asio/reference/windows__basic_object_handle/get_implementation.html
+/doc/asio/reference/windows__basic_object_handle/get_implementation/overload1.html
+/doc/asio/reference/windows__basic_object_handle/get_implementation/overload2.html
+/doc/asio/reference/windows__basic_object_handle/get_io_service.html
+/doc/asio/reference/windows__basic_object_handle/get_service/
+/doc/asio/reference/windows__basic_object_handle/get_service.html
+/doc/asio/reference/windows__basic_object_handle/get_service/overload1.html
+/doc/asio/reference/windows__basic_object_handle/get_service/overload2.html
+/doc/asio/reference/windows__basic_object_handle.html
+/doc/asio/reference/windows__basic_object_handle/implementation.html
+/doc/asio/reference/windows__basic_object_handle/implementation_type.html
+/doc/asio/reference/windows__basic_object_handle/is_open.html
+/doc/asio/reference/windows__basic_object_handle/lowest_layer/
+/doc/asio/reference/windows__basic_object_handle/lowest_layer.html
+/doc/asio/reference/windows__basic_object_handle/lowest_layer/overload1.html
+/doc/asio/reference/windows__basic_object_handle/lowest_layer/overload2.html
+/doc/asio/reference/windows__basic_object_handle/lowest_layer_type.html
+/doc/asio/reference/windows__basic_object_handle/native_handle.html
+/doc/asio/reference/windows__basic_object_handle/native_handle_type.html
+/doc/asio/reference/windows__basic_object_handle/native.html
+/doc/asio/reference/windows__basic_object_handle/native_type.html
+/doc/asio/reference/windows__basic_object_handle/operator_eq_.html
+/doc/asio/reference/windows__basic_object_handle/service.html
+/doc/asio/reference/windows__basic_object_handle/service_type.html
+/doc/asio/reference/windows__basic_object_handle/wait/
+/doc/asio/reference/windows__basic_object_handle/wait.html
+/doc/asio/reference/windows__basic_object_handle/wait/overload1.html
+/doc/asio/reference/windows__basic_object_handle/wait/overload2.html
 /doc/asio/reference/windows__basic_random_access_handle/
 /doc/asio/reference/windows__basic_random_access_handle/assign/
 /doc/asio/reference/windows__basic_random_access_handle/assign.html
@@ -3018,6 +3148,25 @@
 /doc/asio/reference/windows__basic_stream_handle/write_some.html
 /doc/asio/reference/windows__basic_stream_handle/write_some/overload1.html
 /doc/asio/reference/windows__basic_stream_handle/write_some/overload2.html
+/doc/asio/reference/windows__object_handle.html
+/doc/asio/reference/windows__object_handle_service/
+/doc/asio/reference/windows__object_handle_service/assign.html
+/doc/asio/reference/windows__object_handle_service/async_wait.html
+/doc/asio/reference/windows__object_handle_service/cancel.html
+/doc/asio/reference/windows__object_handle_service/close.html
+/doc/asio/reference/windows__object_handle_service/construct.html
+/doc/asio/reference/windows__object_handle_service/destroy.html
+/doc/asio/reference/windows__object_handle_service/get_io_service.html
+/doc/asio/reference/windows__object_handle_service.html
+/doc/asio/reference/windows__object_handle_service/id.html
+/doc/asio/reference/windows__object_handle_service/implementation_type.html
+/doc/asio/reference/windows__object_handle_service/is_open.html
+/doc/asio/reference/windows__object_handle_service/move_assign.html
+/doc/asio/reference/windows__object_handle_service/move_construct.html
+/doc/asio/reference/windows__object_handle_service/native_handle.html
+/doc/asio/reference/windows__object_handle_service/native_handle_type.html
+/doc/asio/reference/windows__object_handle_service/object_handle_service.html
+/doc/asio/reference/windows__object_handle_service/wait.html
 /doc/asio/reference/windows__overlapped_ptr/
 /doc/asio/reference/windows__overlapped_ptr/complete.html
 /doc/asio/reference/windows__overlapped_ptr/get/
@@ -3179,6 +3328,7 @@
 /include/asio/basic_streambuf_fwd.hpp
 /include/asio/basic_streambuf.hpp
 /include/asio/basic_stream_socket.hpp
+/include/asio/basic_waitable_timer.hpp
 /include/asio/buffered_read_stream_fwd.hpp
 /include/asio/buffered_read_stream.hpp
 /include/asio/buffered_stream_fwd.hpp
@@ -3202,9 +3352,11 @@
 /include/asio/detail/buffer_resize_guard.hpp
 /include/asio/detail/buffer_sequence_adapter.hpp
 /include/asio/detail/call_stack.hpp
+/include/asio/detail/chrono_time_traits.hpp
 /include/asio/detail/completion_handler.hpp
 /include/asio/detail/config.hpp
 /include/asio/detail/consuming_buffers.hpp
+/include/asio/detail/date_time_fwd.hpp
 /include/asio/detail/deadline_timer_service.hpp
 /include/asio/detail/dependent_type.hpp
 /include/asio/detail/descriptor_ops.hpp
@@ -3258,7 +3410,7 @@
 /include/asio/detail/impl/task_io_service.hpp
 /include/asio/detail/impl/task_io_service.ipp
 /include/asio/detail/impl/throw_error.ipp
-/include/asio/detail/impl/timer_queue.ipp
+/include/asio/detail/impl/timer_queue_ptime.ipp
 /include/asio/detail/impl/timer_queue_set.ipp
 /include/asio/detail/impl/win_event.ipp
 /include/asio/detail/impl/win_iocp_handle_service.ipp
@@ -3267,6 +3419,7 @@
 /include/asio/detail/impl/win_iocp_serial_port_service.ipp
 /include/asio/detail/impl/win_iocp_socket_service_base.ipp
 /include/asio/detail/impl/win_mutex.ipp
+/include/asio/detail/impl/win_object_handle_service.ipp
 /include/asio/detail/impl/winsock_init.ipp
 /include/asio/detail/impl/win_static_mutex.ipp
 /include/asio/detail/impl/win_thread.ipp
@@ -3346,15 +3499,16 @@
 /include/asio/detail/task_io_service_operation.hpp
 /include/asio/detail/thread.hpp
 /include/asio/detail/throw_error.hpp
-/include/asio/detail/timer_op.hpp
 /include/asio/detail/timer_queue_base.hpp
 /include/asio/detail/timer_queue_fwd.hpp
 /include/asio/detail/timer_queue.hpp
+/include/asio/detail/timer_queue_ptime.hpp
 /include/asio/detail/timer_queue_set.hpp
 /include/asio/detail/timer_scheduler_fwd.hpp
 /include/asio/detail/timer_scheduler.hpp
 /include/asio/detail/tss_ptr.hpp
 /include/asio/detail/wait_handler.hpp
+/include/asio/detail/wait_op.hpp
 /include/asio/detail/weak_ptr.hpp
 /include/asio/detail/wince_thread.hpp
 /include/asio/detail/win_event.hpp
@@ -3378,6 +3532,7 @@
 /include/asio/detail/win_iocp_socket_service_base.hpp
 /include/asio/detail/win_iocp_socket_service.hpp
 /include/asio/detail/win_mutex.hpp
+/include/asio/detail/win_object_handle_service.hpp
 /include/asio/detail/winsock_init.hpp
 /include/asio/detail/win_static_mutex.hpp
 /include/asio/detail/win_thread.hpp
@@ -3387,6 +3542,7 @@
 /include/asio/error.hpp
 /include/asio/handler_alloc_hook.hpp
 /include/asio/handler_invoke_hook.hpp
+/include/asio/high_resolution_timer.hpp
 /include/asio.hpp
 /include/asio/impl/
 /include/asio/impl/connect.hpp
@@ -3509,17 +3665,24 @@
 /include/asio/ssl/stream_service.hpp
 /include/asio/ssl/verify_context.hpp
 /include/asio/ssl/verify_mode.hpp
+/include/asio/steady_timer.hpp
 /include/asio/strand.hpp
 /include/asio/streambuf.hpp
 /include/asio/stream_socket_service.hpp
 /include/asio/system_error.hpp
+/include/asio/system_timer.hpp
 /include/asio/thread.hpp
 /include/asio/time_traits.hpp
 /include/asio/version.hpp
+/include/asio/waitable_timer_service.hpp
+/include/asio/wait_traits.hpp
 /include/asio/windows/
 /include/asio/windows/basic_handle.hpp
+/include/asio/windows/basic_object_handle.hpp
 /include/asio/windows/basic_random_access_handle.hpp
 /include/asio/windows/basic_stream_handle.hpp
+/include/asio/windows/object_handle.hpp
+/include/asio/windows/object_handle_service.hpp
 /include/asio/windows/overlapped_ptr.hpp
 /include/asio/windows/random_access_handle.hpp
 /include/asio/windows/random_access_handle_service.hpp
@@ -3746,6 +3909,7 @@
 /src/tests/unit/basic_socket_acceptor.cpp
 /src/tests/unit/basic_streambuf.cpp
 /src/tests/unit/basic_stream_socket.cpp
+/src/tests/unit/basic_waitable_timer.cpp
 /src/tests/unit/buffer.cpp
 /src/tests/unit/buffered_read_stream.cpp
 /src/tests/unit/buffered_stream.cpp
@@ -3757,6 +3921,7 @@
 /src/tests/unit/deadline_timer.cpp
 /src/tests/unit/deadline_timer_service.cpp
 /src/tests/unit/error.cpp
+/src/tests/unit/high_resolution_timer.cpp
 /src/tests/unit/io_service.cpp
 /src/tests/unit/ip/
 /src/tests/unit/ip/address.cpp
@@ -3810,17 +3975,24 @@
 /src/tests/unit/ssl/stream_base.cpp
 /src/tests/unit/ssl/stream.cpp
 /src/tests/unit/ssl/stream_service.cpp
+/src/tests/unit/steady_timer.cpp
 /src/tests/unit/strand.cpp
 /src/tests/unit/streambuf.cpp
 /src/tests/unit/stream_socket_service.cpp
+/src/tests/unit/system_timer.cpp
 /src/tests/unit/thread.cpp
 /src/tests/unit/time_traits.cpp
 /src/tests/unit/unit_test.cpp
 /src/tests/unit/unit_test.hpp
+/src/tests/unit/waitable_timer_service.cpp
+/src/tests/unit/wait_traits.cpp
 /src/tests/unit/windows/
 /src/tests/unit/windows/basic_handle.cpp
+/src/tests/unit/windows/basic_object_handle.cpp
 /src/tests/unit/windows/basic_random_access_handle.cpp
 /src/tests/unit/windows/basic_stream_handle.cpp
+/src/tests/unit/windows/object_handle.cpp
+/src/tests/unit/windows/object_handle_service.cpp
 /src/tests/unit/windows/overlapped_ptr.cpp
 /src/tests/unit/windows/random_access_handle.cpp
 /src/tests/unit/windows/random_access_handle_service.cpp
diff --git a/asio/boost_asio.manifest b/asio/boost_asio.manifest
index af9c9d0..07835c6 100644
--- a/asio/boost_asio.manifest
+++ b/asio/boost_asio.manifest
@@ -15,6 +15,7 @@
 /boost/asio/basic_streambuf_fwd.hpp
 /boost/asio/basic_streambuf.hpp
 /boost/asio/basic_stream_socket.hpp
+/boost/asio/basic_waitable_timer.hpp
 /boost/asio/buffered_read_stream_fwd.hpp
 /boost/asio/buffered_read_stream.hpp
 /boost/asio/buffered_stream_fwd.hpp
@@ -38,9 +39,11 @@
 /boost/asio/detail/buffer_resize_guard.hpp
 /boost/asio/detail/buffer_sequence_adapter.hpp
 /boost/asio/detail/call_stack.hpp
+/boost/asio/detail/chrono_time_traits.hpp
 /boost/asio/detail/completion_handler.hpp
 /boost/asio/detail/config.hpp
 /boost/asio/detail/consuming_buffers.hpp
+/boost/asio/detail/date_time_fwd.hpp
 /boost/asio/detail/deadline_timer_service.hpp
 /boost/asio/detail/dependent_type.hpp
 /boost/asio/detail/descriptor_ops.hpp
@@ -94,7 +97,7 @@
 /boost/asio/detail/impl/task_io_service.hpp
 /boost/asio/detail/impl/task_io_service.ipp
 /boost/asio/detail/impl/throw_error.ipp
-/boost/asio/detail/impl/timer_queue.ipp
+/boost/asio/detail/impl/timer_queue_ptime.ipp
 /boost/asio/detail/impl/timer_queue_set.ipp
 /boost/asio/detail/impl/win_event.ipp
 /boost/asio/detail/impl/win_iocp_handle_service.ipp
@@ -103,6 +106,7 @@
 /boost/asio/detail/impl/win_iocp_serial_port_service.ipp
 /boost/asio/detail/impl/win_iocp_socket_service_base.ipp
 /boost/asio/detail/impl/win_mutex.ipp
+/boost/asio/detail/impl/win_object_handle_service.ipp
 /boost/asio/detail/impl/winsock_init.ipp
 /boost/asio/detail/impl/win_static_mutex.ipp
 /boost/asio/detail/impl/win_thread.ipp
@@ -182,15 +186,16 @@
 /boost/asio/detail/task_io_service_operation.hpp
 /boost/asio/detail/thread.hpp
 /boost/asio/detail/throw_error.hpp
-/boost/asio/detail/timer_op.hpp
 /boost/asio/detail/timer_queue_base.hpp
 /boost/asio/detail/timer_queue_fwd.hpp
 /boost/asio/detail/timer_queue.hpp
+/boost/asio/detail/timer_queue_ptime.hpp
 /boost/asio/detail/timer_queue_set.hpp
 /boost/asio/detail/timer_scheduler_fwd.hpp
 /boost/asio/detail/timer_scheduler.hpp
 /boost/asio/detail/tss_ptr.hpp
 /boost/asio/detail/wait_handler.hpp
+/boost/asio/detail/wait_op.hpp
 /boost/asio/detail/weak_ptr.hpp
 /boost/asio/detail/wince_thread.hpp
 /boost/asio/detail/win_event.hpp
@@ -214,6 +219,7 @@
 /boost/asio/detail/win_iocp_socket_service_base.hpp
 /boost/asio/detail/win_iocp_socket_service.hpp
 /boost/asio/detail/win_mutex.hpp
+/boost/asio/detail/win_object_handle_service.hpp
 /boost/asio/detail/winsock_init.hpp
 /boost/asio/detail/win_static_mutex.hpp
 /boost/asio/detail/win_thread.hpp
@@ -222,6 +228,7 @@
 /boost/asio/error.hpp
 /boost/asio/handler_alloc_hook.hpp
 /boost/asio/handler_invoke_hook.hpp
+/boost/asio/high_resolution_timer.hpp
 /boost/asio.hpp
 /boost/asio/impl/
 /boost/asio/impl/connect.hpp
@@ -343,15 +350,22 @@
 /boost/asio/ssl/stream_service.hpp
 /boost/asio/ssl/verify_context.hpp
 /boost/asio/ssl/verify_mode.hpp
+/boost/asio/steady_timer.hpp
 /boost/asio/strand.hpp
 /boost/asio/streambuf.hpp
 /boost/asio/stream_socket_service.hpp
+/boost/asio/system_timer.hpp
 /boost/asio/time_traits.hpp
 /boost/asio/version.hpp
+/boost/asio/waitable_timer_service.hpp
+/boost/asio/wait_traits.hpp
 /boost/asio/windows/
 /boost/asio/windows/basic_handle.hpp
+/boost/asio/windows/basic_object_handle.hpp
 /boost/asio/windows/basic_random_access_handle.hpp
 /boost/asio/windows/basic_stream_handle.hpp
+/boost/asio/windows/object_handle.hpp
+/boost/asio/windows/object_handle_service.hpp
 /boost/asio/windows/overlapped_ptr.hpp
 /boost/asio/windows/random_access_handle.hpp
 /boost/asio/windows/random_access_handle_service.hpp
@@ -540,6 +554,7 @@
 /doc/html/boost_asio/overview/cpp2011/
 /doc/html/boost_asio/overview/cpp2011/array.html
 /doc/html/boost_asio/overview/cpp2011/atomic.html
+/doc/html/boost_asio/overview/cpp2011/chrono.html
 /doc/html/boost_asio/overview/cpp2011.html
 /doc/html/boost_asio/overview/cpp2011/move_handlers.html
 /doc/html/boost_asio/overview/cpp2011/move_objects.html
@@ -564,6 +579,7 @@
 /doc/html/boost_asio/overview/timers.html
 /doc/html/boost_asio/overview/windows/
 /doc/html/boost_asio/overview/windows.html
+/doc/html/boost_asio/overview/windows/object_handle.html
 /doc/html/boost_asio/overview/windows/random_access_handle.html
 /doc/html/boost_asio/overview/windows/stream_handle.html
 /doc/html/boost_asio/proactor.png
@@ -1795,6 +1811,53 @@
 /doc/html/boost_asio/reference/basic_stream_socket/write_some.html
 /doc/html/boost_asio/reference/basic_stream_socket/write_some/overload1.html
 /doc/html/boost_asio/reference/basic_stream_socket/write_some/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer/
+/doc/html/boost_asio/reference/basic_waitable_timer/async_wait.html
+/doc/html/boost_asio/reference/basic_waitable_timer/basic_waitable_timer/
+/doc/html/boost_asio/reference/basic_waitable_timer/basic_waitable_timer.html
+/doc/html/boost_asio/reference/basic_waitable_timer/basic_waitable_timer/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/basic_waitable_timer/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer/basic_waitable_timer/overload3.html
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel/
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel.html
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel_one/
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel_one.html
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel_one/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel_one/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/cancel/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer/clock_type.html
+/doc/html/boost_asio/reference/basic_waitable_timer/duration.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_at/
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_at.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_at/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_at/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_at/overload3.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_from_now/
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_from_now.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_from_now/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_from_now/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer/expires_from_now/overload3.html
+/doc/html/boost_asio/reference/basic_waitable_timer/get_implementation/
+/doc/html/boost_asio/reference/basic_waitable_timer/get_implementation.html
+/doc/html/boost_asio/reference/basic_waitable_timer/get_implementation/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/get_implementation/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer/get_io_service.html
+/doc/html/boost_asio/reference/basic_waitable_timer/get_service/
+/doc/html/boost_asio/reference/basic_waitable_timer/get_service.html
+/doc/html/boost_asio/reference/basic_waitable_timer/get_service/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/get_service/overload2.html
+/doc/html/boost_asio/reference/basic_waitable_timer.html
+/doc/html/boost_asio/reference/basic_waitable_timer/implementation.html
+/doc/html/boost_asio/reference/basic_waitable_timer/implementation_type.html
+/doc/html/boost_asio/reference/basic_waitable_timer/service.html
+/doc/html/boost_asio/reference/basic_waitable_timer/service_type.html
+/doc/html/boost_asio/reference/basic_waitable_timer/time_point.html
+/doc/html/boost_asio/reference/basic_waitable_timer/traits_type.html
+/doc/html/boost_asio/reference/basic_waitable_timer/wait/
+/doc/html/boost_asio/reference/basic_waitable_timer/wait.html
+/doc/html/boost_asio/reference/basic_waitable_timer/wait/overload1.html
+/doc/html/boost_asio/reference/basic_waitable_timer/wait/overload2.html
 /doc/html/boost_asio/reference/buffer/
 /doc/html/boost_asio/reference/buffer_cast/
 /doc/html/boost_asio/reference/buffer_cast.html
@@ -2181,6 +2244,7 @@
 /doc/html/boost_asio/reference/HandleService.html
 /doc/html/boost_asio/reference/HandshakeHandler.html
 /doc/html/boost_asio/reference/has_service.html
+/doc/html/boost_asio/reference/high_resolution_timer.html
 /doc/html/boost_asio/reference.html
 /doc/html/boost_asio/reference/InternetProtocol.html
 /doc/html/boost_asio/reference/invalid_service_owner/
@@ -2680,6 +2744,7 @@
 /doc/html/boost_asio/reference/null_buffers/end.html
 /doc/html/boost_asio/reference/null_buffers.html
 /doc/html/boost_asio/reference/null_buffers/value_type.html
+/doc/html/boost_asio/reference/ObjectHandleService.html
 /doc/html/boost_asio/reference/placeholders__bytes_transferred.html
 /doc/html/boost_asio/reference/placeholders__error.html
 /doc/html/boost_asio/reference/placeholders__iterator.html
@@ -3283,6 +3348,7 @@
 /doc/html/boost_asio/reference/ssl__verify_mode.html
 /doc/html/boost_asio/reference/ssl__verify_none.html
 /doc/html/boost_asio/reference/ssl__verify_peer.html
+/doc/html/boost_asio/reference/steady_timer.html
 /doc/html/boost_asio/reference/strand.html
 /doc/html/boost_asio/reference/streambuf.html
 /doc/html/boost_asio/reference/StreamDescriptorService.html
@@ -3336,6 +3402,7 @@
 /doc/html/boost_asio/reference/SyncRandomAccessWriteDevice.html
 /doc/html/boost_asio/reference/SyncReadStream.html
 /doc/html/boost_asio/reference/SyncWriteStream.html
+/doc/html/boost_asio/reference/system_timer.html
 /doc/html/boost_asio/reference/TimerService.html
 /doc/html/boost_asio/reference/TimeTraits.html
 /doc/html/boost_asio/reference/time_traits_lt__ptime__gt_/
@@ -3351,7 +3418,36 @@
 /doc/html/boost_asio/reference/transfer_at_least.html
 /doc/html/boost_asio/reference/transfer_exactly.html
 /doc/html/boost_asio/reference/use_service.html
+/doc/html/boost_asio/reference/waitable_timer_service/
+/doc/html/boost_asio/reference/waitable_timer_service/async_wait.html
+/doc/html/boost_asio/reference/waitable_timer_service/cancel.html
+/doc/html/boost_asio/reference/waitable_timer_service/cancel_one.html
+/doc/html/boost_asio/reference/waitable_timer_service/clock_type.html
+/doc/html/boost_asio/reference/waitable_timer_service/construct.html
+/doc/html/boost_asio/reference/waitable_timer_service/destroy.html
+/doc/html/boost_asio/reference/waitable_timer_service/duration.html
+/doc/html/boost_asio/reference/waitable_timer_service/expires_at/
+/doc/html/boost_asio/reference/waitable_timer_service/expires_at.html
+/doc/html/boost_asio/reference/waitable_timer_service/expires_at/overload1.html
+/doc/html/boost_asio/reference/waitable_timer_service/expires_at/overload2.html
+/doc/html/boost_asio/reference/waitable_timer_service/expires_from_now/
+/doc/html/boost_asio/reference/waitable_timer_service/expires_from_now.html
+/doc/html/boost_asio/reference/waitable_timer_service/expires_from_now/overload1.html
+/doc/html/boost_asio/reference/waitable_timer_service/expires_from_now/overload2.html
+/doc/html/boost_asio/reference/waitable_timer_service/get_io_service.html
+/doc/html/boost_asio/reference/WaitableTimerService.html
+/doc/html/boost_asio/reference/waitable_timer_service.html
+/doc/html/boost_asio/reference/waitable_timer_service/id.html
+/doc/html/boost_asio/reference/waitable_timer_service/implementation_type.html
+/doc/html/boost_asio/reference/waitable_timer_service/time_point.html
+/doc/html/boost_asio/reference/waitable_timer_service/traits_type.html
+/doc/html/boost_asio/reference/waitable_timer_service/waitable_timer_service.html
+/doc/html/boost_asio/reference/waitable_timer_service/wait.html
 /doc/html/boost_asio/reference/WaitHandler.html
+/doc/html/boost_asio/reference/wait_traits/
+/doc/html/boost_asio/reference/WaitTraits.html
+/doc/html/boost_asio/reference/wait_traits.html
+/doc/html/boost_asio/reference/wait_traits/to_wait_duration.html
 /doc/html/boost_asio/reference/windows__basic_handle/
 /doc/html/boost_asio/reference/windows__basic_handle/assign/
 /doc/html/boost_asio/reference/windows__basic_handle/assign.html
@@ -3396,6 +3492,54 @@
 /doc/html/boost_asio/reference/windows__basic_handle/operator_eq_.html
 /doc/html/boost_asio/reference/windows__basic_handle/service.html
 /doc/html/boost_asio/reference/windows__basic_handle/service_type.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/
+/doc/html/boost_asio/reference/windows__basic_object_handle/assign/
+/doc/html/boost_asio/reference/windows__basic_object_handle/assign.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/assign/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/assign/overload2.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/async_wait.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/basic_object_handle/
+/doc/html/boost_asio/reference/windows__basic_object_handle/basic_object_handle.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/basic_object_handle/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/basic_object_handle/overload2.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/basic_object_handle/overload3.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/cancel/
+/doc/html/boost_asio/reference/windows__basic_object_handle/cancel.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/cancel/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/cancel/overload2.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/close/
+/doc/html/boost_asio/reference/windows__basic_object_handle/close.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/close/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/close/overload2.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_implementation/
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_implementation.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_implementation/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_implementation/overload2.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_io_service.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_service/
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_service.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_service/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/get_service/overload2.html
+/doc/html/boost_asio/reference/windows__basic_object_handle.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/implementation.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/implementation_type.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/is_open.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/lowest_layer/
+/doc/html/boost_asio/reference/windows__basic_object_handle/lowest_layer.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/lowest_layer/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/lowest_layer/overload2.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/lowest_layer_type.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/native_handle.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/native_handle_type.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/native.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/native_type.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/operator_eq_.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/service.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/service_type.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/wait/
+/doc/html/boost_asio/reference/windows__basic_object_handle/wait.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/wait/overload1.html
+/doc/html/boost_asio/reference/windows__basic_object_handle/wait/overload2.html
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/assign/
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/assign.html
@@ -3502,6 +3646,25 @@
 /doc/html/boost_asio/reference/windows__basic_stream_handle/write_some.html
 /doc/html/boost_asio/reference/windows__basic_stream_handle/write_some/overload1.html
 /doc/html/boost_asio/reference/windows__basic_stream_handle/write_some/overload2.html
+/doc/html/boost_asio/reference/windows__object_handle.html
+/doc/html/boost_asio/reference/windows__object_handle_service/
+/doc/html/boost_asio/reference/windows__object_handle_service/assign.html
+/doc/html/boost_asio/reference/windows__object_handle_service/async_wait.html
+/doc/html/boost_asio/reference/windows__object_handle_service/cancel.html
+/doc/html/boost_asio/reference/windows__object_handle_service/close.html
+/doc/html/boost_asio/reference/windows__object_handle_service/construct.html
+/doc/html/boost_asio/reference/windows__object_handle_service/destroy.html
+/doc/html/boost_asio/reference/windows__object_handle_service/get_io_service.html
+/doc/html/boost_asio/reference/windows__object_handle_service.html
+/doc/html/boost_asio/reference/windows__object_handle_service/id.html
+/doc/html/boost_asio/reference/windows__object_handle_service/implementation_type.html
+/doc/html/boost_asio/reference/windows__object_handle_service/is_open.html
+/doc/html/boost_asio/reference/windows__object_handle_service/move_assign.html
+/doc/html/boost_asio/reference/windows__object_handle_service/move_construct.html
+/doc/html/boost_asio/reference/windows__object_handle_service/native_handle.html
+/doc/html/boost_asio/reference/windows__object_handle_service/native_handle_type.html
+/doc/html/boost_asio/reference/windows__object_handle_service/object_handle_service.html
+/doc/html/boost_asio/reference/windows__object_handle_service/wait.html
 /doc/html/boost_asio/reference/windows__overlapped_ptr/
 /doc/html/boost_asio/reference/windows__overlapped_ptr/complete.html
 /doc/html/boost_asio/reference/windows__overlapped_ptr/get/
@@ -3697,6 +3860,7 @@
 /libs/asio/doc/requirements/IoControlCommand.qbk
 /libs/asio/doc/requirements/IoObjectService.qbk
 /libs/asio/doc/requirements/MutableBufferSequence.qbk
+/libs/asio/doc/requirements/ObjectHandleService.qbk
 /libs/asio/doc/requirements/Protocol.qbk
 /libs/asio/doc/requirements.qbk
 /libs/asio/doc/requirements/RandomAccessHandleService.qbk
@@ -3723,7 +3887,9 @@
 /libs/asio/doc/requirements/SyncWriteStream.qbk
 /libs/asio/doc/requirements/TimerService.qbk
 /libs/asio/doc/requirements/TimeTraits.qbk
+/libs/asio/doc/requirements/WaitableTimerService.qbk
 /libs/asio/doc/requirements/WaitHandler.qbk
+/libs/asio/doc/requirements/WaitTraits.qbk
 /libs/asio/doc/requirements/WriteHandler.qbk
 /libs/asio/doc/std_exception_dox.txt
 /libs/asio/doc/tutorial.dox
@@ -3977,6 +4143,7 @@
 /libs/asio/test/basic_socket_acceptor.cpp
 /libs/asio/test/basic_streambuf.cpp
 /libs/asio/test/basic_stream_socket.cpp
+/libs/asio/test/basic_waitable_timer.cpp
 /libs/asio/test/buffer.cpp
 /libs/asio/test/buffered_read_stream.cpp
 /libs/asio/test/buffered_stream.cpp
@@ -3988,6 +4155,7 @@
 /libs/asio/test/deadline_timer.cpp
 /libs/asio/test/deadline_timer_service.cpp
 /libs/asio/test/error.cpp
+/libs/asio/test/high_resolution_timer.cpp
 /libs/asio/test/io_service.cpp
 /libs/asio/test/ip/
 /libs/asio/test/ip/address.cpp
@@ -4056,15 +4224,22 @@
 /libs/asio/test/ssl/stream_base.cpp
 /libs/asio/test/ssl/stream.cpp
 /libs/asio/test/ssl/stream_service.cpp
+/libs/asio/test/steady_timer.cpp
 /libs/asio/test/strand.cpp
 /libs/asio/test/streambuf.cpp
 /libs/asio/test/stream_socket_service.cpp
+/libs/asio/test/system_timer.cpp
 /libs/asio/test/time_traits.cpp
 /libs/asio/test/unit_test.hpp
+/libs/asio/test/waitable_timer_service.cpp
+/libs/asio/test/wait_traits.cpp
 /libs/asio/test/windows/
 /libs/asio/test/windows/basic_handle.cpp
+/libs/asio/test/windows/basic_object_handle.cpp
 /libs/asio/test/windows/basic_random_access_handle.cpp
 /libs/asio/test/windows/basic_stream_handle.cpp
+/libs/asio/test/windows/object_handle.cpp
+/libs/asio/test/windows/object_handle_service.cpp
 /libs/asio/test/windows/overlapped_ptr.cpp
 /libs/asio/test/windows/random_access_handle.cpp
 /libs/asio/test/windows/random_access_handle_service.cpp
diff --git a/asio/configure.ac b/asio/configure.ac
index 06c67ab..1be7818 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.6.1])
+AC_INIT(asio, [1.8.0])
 AC_CONFIG_SRCDIR(include/asio.hpp)
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE([tar-ustar])
diff --git a/asio/include/asio/version.hpp b/asio/include/asio/version.hpp
index d1f0889..473551c 100644
--- a/asio/include/asio/version.hpp
+++ b/asio/include/asio/version.hpp
@@ -18,6 +18,6 @@
 // ASIO_VERSION % 100 is the sub-minor version
 // ASIO_VERSION / 100 % 1000 is the minor version
 // ASIO_VERSION / 100000 is the major version
-#define ASIO_VERSION 100601 // 1.6.1
+#define ASIO_VERSION 100800 // 1.8.0
 
 #endif // ASIO_VERSION_HPP