asio version 1.6.1 released
diff --git a/asio/README b/asio/README
index 3b96d90..75893d5 100644
--- a/asio/README
+++ b/asio/README
@@ -1,4 +1,4 @@
-asio version 1.6.0
-Released Sunday, 11 September 2011.
+asio version 1.6.1
+Released Tuesday, 22 May 2012.
 
 See doc/index.html for API documentation and a tutorial.
diff --git a/asio/asio.manifest b/asio/asio.manifest
index c14acdf..6b7c3f9 100644
--- a/asio/asio.manifest
+++ b/asio/asio.manifest
@@ -1586,8 +1586,8 @@
 /doc/asio/reference/datagram_socket_service/endpoint_type.html
 /doc/asio/reference/datagram_socket_service/get_io_service.html
 /doc/asio/reference/datagram_socket_service/get_option.html
-/doc/asio/reference/datagram_socket_service.html
 /doc/asio/reference/DatagramSocketService.html
+/doc/asio/reference/datagram_socket_service.html
 /doc/asio/reference/datagram_socket_service/id.html
 /doc/asio/reference/datagram_socket_service/implementation_type.html
 /doc/asio/reference/datagram_socket_service/io_control.html
@@ -1735,10 +1735,12 @@
 /doc/asio/reference/io_service/run/overload1.html
 /doc/asio/reference/io_service/run/overload2.html
 /doc/asio/reference/io_service__service/
+/doc/asio/reference/io_service__service/fork_service.html
 /doc/asio/reference/io_service__service/get_io_service.html
 /doc/asio/reference/io_service__service.html
 /doc/asio/reference/io_service__service/_service.html
 /doc/asio/reference/io_service__service/service.html
+/doc/asio/reference/io_service__service/shutdown_service.html
 /doc/asio/reference/io_service/stop.html
 /doc/asio/reference/io_service/stopped.html
 /doc/asio/reference/io_service__strand/
@@ -1959,8 +1961,8 @@
 /doc/asio/reference/ip__basic_resolver_iterator/create/overload1.html
 /doc/asio/reference/ip__basic_resolver_iterator/create/overload2.html
 /doc/asio/reference/ip__basic_resolver_iterator/difference_type.html
-/doc/asio/reference/ip__basic_resolver_iterator.html
 /doc/asio/reference/ip__basic_resolver/iterator.html
+/doc/asio/reference/ip__basic_resolver_iterator.html
 /doc/asio/reference/ip__basic_resolver_iterator/iterator_category.html
 /doc/asio/reference/ip__basic_resolver_iterator/operator_arrow_.html
 /doc/asio/reference/ip__basic_resolver_iterator/operator_eq__eq_.html
@@ -1987,8 +1989,8 @@
 /doc/asio/reference/ip__basic_resolver_query/flags.html
 /doc/asio/reference/ip__basic_resolver_query/hints.html
 /doc/asio/reference/ip__basic_resolver_query/host_name.html
-/doc/asio/reference/ip__basic_resolver_query.html
 /doc/asio/reference/ip__basic_resolver/query.html
+/doc/asio/reference/ip__basic_resolver_query.html
 /doc/asio/reference/ip__basic_resolver_query/numeric_host.html
 /doc/asio/reference/ip__basic_resolver_query/numeric_service.html
 /doc/asio/reference/ip__basic_resolver_query/passive.html
@@ -2370,8 +2372,8 @@
 /doc/asio/reference/raw_socket_service/endpoint_type.html
 /doc/asio/reference/raw_socket_service/get_io_service.html
 /doc/asio/reference/raw_socket_service/get_option.html
-/doc/asio/reference/raw_socket_service.html
 /doc/asio/reference/RawSocketService.html
+/doc/asio/reference/raw_socket_service.html
 /doc/asio/reference/raw_socket_service/id.html
 /doc/asio/reference/raw_socket_service/implementation_type.html
 /doc/asio/reference/raw_socket_service/io_control.html
@@ -2450,8 +2452,8 @@
 /doc/asio/reference/seq_packet_socket_service/endpoint_type.html
 /doc/asio/reference/seq_packet_socket_service/get_io_service.html
 /doc/asio/reference/seq_packet_socket_service/get_option.html
-/doc/asio/reference/seq_packet_socket_service.html
 /doc/asio/reference/SeqPacketSocketService.html
+/doc/asio/reference/seq_packet_socket_service.html
 /doc/asio/reference/seq_packet_socket_service/id.html
 /doc/asio/reference/seq_packet_socket_service/implementation_type.html
 /doc/asio/reference/seq_packet_socket_service/io_control.html
@@ -2526,8 +2528,8 @@
 /doc/asio/reference/serial_port_service/destroy.html
 /doc/asio/reference/serial_port_service/get_io_service.html
 /doc/asio/reference/serial_port_service/get_option.html
-/doc/asio/reference/serial_port_service.html
 /doc/asio/reference/SerialPortService.html
+/doc/asio/reference/serial_port_service.html
 /doc/asio/reference/serial_port_service/id.html
 /doc/asio/reference/serial_port_service/implementation_type.html
 /doc/asio/reference/serial_port_service/is_open.html
@@ -2560,8 +2562,8 @@
 /doc/asio/reference/signal_set_service/construct.html
 /doc/asio/reference/signal_set_service/destroy.html
 /doc/asio/reference/signal_set_service/get_io_service.html
-/doc/asio/reference/signal_set_service.html
 /doc/asio/reference/SignalSetService.html
+/doc/asio/reference/signal_set_service.html
 /doc/asio/reference/signal_set_service/id.html
 /doc/asio/reference/signal_set_service/implementation_type.html
 /doc/asio/reference/signal_set_service/remove.html
@@ -2578,8 +2580,8 @@
 /doc/asio/reference/socket_acceptor_service/endpoint_type.html
 /doc/asio/reference/socket_acceptor_service/get_io_service.html
 /doc/asio/reference/socket_acceptor_service/get_option.html
-/doc/asio/reference/socket_acceptor_service.html
 /doc/asio/reference/SocketAcceptorService.html
+/doc/asio/reference/socket_acceptor_service.html
 /doc/asio/reference/socket_acceptor_service/id.html
 /doc/asio/reference/socket_acceptor_service/implementation_type.html
 /doc/asio/reference/socket_acceptor_service/io_control.html
@@ -2800,8 +2802,8 @@
 /doc/asio/reference/stream_socket_service/endpoint_type.html
 /doc/asio/reference/stream_socket_service/get_io_service.html
 /doc/asio/reference/stream_socket_service/get_option.html
-/doc/asio/reference/stream_socket_service.html
 /doc/asio/reference/StreamSocketService.html
+/doc/asio/reference/stream_socket_service.html
 /doc/asio/reference/stream_socket_service/id.html
 /doc/asio/reference/stream_socket_service/implementation_type.html
 /doc/asio/reference/stream_socket_service/io_control.html
@@ -3204,6 +3206,7 @@
 /include/asio/detail/config.hpp
 /include/asio/detail/consuming_buffers.hpp
 /include/asio/detail/deadline_timer_service.hpp
+/include/asio/detail/dependent_type.hpp
 /include/asio/detail/descriptor_ops.hpp
 /include/asio/detail/descriptor_read_op.hpp
 /include/asio/detail/descriptor_write_op.hpp
@@ -3716,6 +3719,7 @@
 /src/Makefile.msc
 /src/tests/
 /src/tests/latency/
+/src/tests/latency/allocator.hpp
 /src/tests/latency/coroutine.hpp
 /src/tests/latency/high_res_clock.hpp
 /src/tests/latency/tcp_client.cpp
diff --git a/asio/boost_asio.manifest b/asio/boost_asio.manifest
index e5a19f6..af9c9d0 100644
--- a/asio/boost_asio.manifest
+++ b/asio/boost_asio.manifest
@@ -42,6 +42,7 @@
 /boost/asio/detail/config.hpp
 /boost/asio/detail/consuming_buffers.hpp
 /boost/asio/detail/deadline_timer_service.hpp
+/boost/asio/detail/dependent_type.hpp
 /boost/asio/detail/descriptor_ops.hpp
 /boost/asio/detail/descriptor_read_op.hpp
 /boost/asio/detail/descriptor_write_op.hpp
@@ -2096,8 +2097,8 @@
 /doc/html/boost_asio/reference/datagram_socket_service/endpoint_type.html
 /doc/html/boost_asio/reference/datagram_socket_service/get_io_service.html
 /doc/html/boost_asio/reference/datagram_socket_service/get_option.html
-/doc/html/boost_asio/reference/datagram_socket_service.html
 /doc/html/boost_asio/reference/DatagramSocketService.html
+/doc/html/boost_asio/reference/datagram_socket_service.html
 /doc/html/boost_asio/reference/datagram_socket_service/id.html
 /doc/html/boost_asio/reference/datagram_socket_service/implementation_type.html
 /doc/html/boost_asio/reference/datagram_socket_service/io_control.html
@@ -2447,8 +2448,8 @@
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/create/overload1.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/create/overload2.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/difference_type.html
-/doc/html/boost_asio/reference/ip__basic_resolver_iterator.html
 /doc/html/boost_asio/reference/ip__basic_resolver/iterator.html
+/doc/html/boost_asio/reference/ip__basic_resolver_iterator.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/iterator_category.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/operator_arrow_.html
 /doc/html/boost_asio/reference/ip__basic_resolver_iterator/operator_eq__eq_.html
@@ -2475,8 +2476,8 @@
 /doc/html/boost_asio/reference/ip__basic_resolver_query/flags.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/hints.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/host_name.html
-/doc/html/boost_asio/reference/ip__basic_resolver_query.html
 /doc/html/boost_asio/reference/ip__basic_resolver/query.html
+/doc/html/boost_asio/reference/ip__basic_resolver_query.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/numeric_host.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/numeric_service.html
 /doc/html/boost_asio/reference/ip__basic_resolver_query/passive.html
@@ -2872,8 +2873,8 @@
 /doc/html/boost_asio/reference/raw_socket_service/endpoint_type.html
 /doc/html/boost_asio/reference/raw_socket_service/get_io_service.html
 /doc/html/boost_asio/reference/raw_socket_service/get_option.html
-/doc/html/boost_asio/reference/raw_socket_service.html
 /doc/html/boost_asio/reference/RawSocketService.html
+/doc/html/boost_asio/reference/raw_socket_service.html
 /doc/html/boost_asio/reference/raw_socket_service/id.html
 /doc/html/boost_asio/reference/raw_socket_service/implementation_type.html
 /doc/html/boost_asio/reference/raw_socket_service/io_control.html
@@ -2952,8 +2953,8 @@
 /doc/html/boost_asio/reference/seq_packet_socket_service/endpoint_type.html
 /doc/html/boost_asio/reference/seq_packet_socket_service/get_io_service.html
 /doc/html/boost_asio/reference/seq_packet_socket_service/get_option.html
-/doc/html/boost_asio/reference/seq_packet_socket_service.html
 /doc/html/boost_asio/reference/SeqPacketSocketService.html
+/doc/html/boost_asio/reference/seq_packet_socket_service.html
 /doc/html/boost_asio/reference/seq_packet_socket_service/id.html
 /doc/html/boost_asio/reference/seq_packet_socket_service/implementation_type.html
 /doc/html/boost_asio/reference/seq_packet_socket_service/io_control.html
@@ -3028,8 +3029,8 @@
 /doc/html/boost_asio/reference/serial_port_service/destroy.html
 /doc/html/boost_asio/reference/serial_port_service/get_io_service.html
 /doc/html/boost_asio/reference/serial_port_service/get_option.html
-/doc/html/boost_asio/reference/serial_port_service.html
 /doc/html/boost_asio/reference/SerialPortService.html
+/doc/html/boost_asio/reference/serial_port_service.html
 /doc/html/boost_asio/reference/serial_port_service/id.html
 /doc/html/boost_asio/reference/serial_port_service/implementation_type.html
 /doc/html/boost_asio/reference/serial_port_service/is_open.html
@@ -3062,8 +3063,8 @@
 /doc/html/boost_asio/reference/signal_set_service/construct.html
 /doc/html/boost_asio/reference/signal_set_service/destroy.html
 /doc/html/boost_asio/reference/signal_set_service/get_io_service.html
-/doc/html/boost_asio/reference/signal_set_service.html
 /doc/html/boost_asio/reference/SignalSetService.html
+/doc/html/boost_asio/reference/signal_set_service.html
 /doc/html/boost_asio/reference/signal_set_service/id.html
 /doc/html/boost_asio/reference/signal_set_service/implementation_type.html
 /doc/html/boost_asio/reference/signal_set_service/remove.html
@@ -3080,8 +3081,8 @@
 /doc/html/boost_asio/reference/socket_acceptor_service/endpoint_type.html
 /doc/html/boost_asio/reference/socket_acceptor_service/get_io_service.html
 /doc/html/boost_asio/reference/socket_acceptor_service/get_option.html
-/doc/html/boost_asio/reference/socket_acceptor_service.html
 /doc/html/boost_asio/reference/SocketAcceptorService.html
+/doc/html/boost_asio/reference/socket_acceptor_service.html
 /doc/html/boost_asio/reference/socket_acceptor_service/id.html
 /doc/html/boost_asio/reference/socket_acceptor_service/implementation_type.html
 /doc/html/boost_asio/reference/socket_acceptor_service/io_control.html
@@ -3302,8 +3303,8 @@
 /doc/html/boost_asio/reference/stream_socket_service/endpoint_type.html
 /doc/html/boost_asio/reference/stream_socket_service/get_io_service.html
 /doc/html/boost_asio/reference/stream_socket_service/get_option.html
-/doc/html/boost_asio/reference/stream_socket_service.html
 /doc/html/boost_asio/reference/StreamSocketService.html
+/doc/html/boost_asio/reference/stream_socket_service.html
 /doc/html/boost_asio/reference/stream_socket_service/id.html
 /doc/html/boost_asio/reference/stream_socket_service/implementation_type.html
 /doc/html/boost_asio/reference/stream_socket_service/io_control.html
@@ -4009,6 +4010,17 @@
 /libs/asio/test/is_write_buffered.cpp
 /libs/asio/test/Jamfile
 /libs/asio/test/Jamfile.v2
+/libs/asio/test/latency/
+/libs/asio/test/latency/allocator.hpp
+/libs/asio/test/latency/coroutine.hpp
+/libs/asio/test/latency/high_res_clock.hpp
+/libs/asio/test/latency/Jamfile.v2
+/libs/asio/test/latency/tcp_client.cpp
+/libs/asio/test/latency/tcp_server.cpp
+/libs/asio/test/latency/udp_client.cpp
+/libs/asio/test/latency/udp_server.cpp
+/libs/asio/test/latency/unyield.hpp
+/libs/asio/test/latency/yield.hpp
 /libs/asio/test/local/
 /libs/asio/test/local/basic_endpoint.cpp
 /libs/asio/test/local/connect_pair.cpp
diff --git a/asio/configure.ac b/asio/configure.ac
index ae78752..06c67ab 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.6.0])
+AC_INIT(asio, [1.6.1])
 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 d8b27f0..6190d81 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 100600 // 1.6.0
+#define ASIO_VERSION 100601 // 1.6.1
 
 #endif // ASIO_VERSION_HPP
diff --git a/asio/release.pl b/asio/release.pl
index 53d23e3..b00bd97 100755
--- a/asio/release.pl
+++ b/asio/release.pl
@@ -348,8 +348,8 @@
 
 sub create_manifests
 {
-  system("tar tfz $asio_name.tar.gz | sed -e 's/^[^\\/]*//' | sort > asio.manifest");
-  system("tar tfz $boost_asio_name.tar.gz | sed -e 's/^[^\\/]*//' | sort > boost_asio.manifest");
+  system("tar tfz $asio_name.tar.gz | sed -e 's/^[^\\/]*//' | sort -df > asio.manifest");
+  system("tar tfz $boost_asio_name.tar.gz | sed -e 's/^[^\\/]*//' | sort -df > boost_asio.manifest");
 }
 
 (scalar(@ARGV) == 1) or print_usage_and_exit();