diff --git a/asio/.gitignore b/asio/.gitignore
index 5d6164c..3248927 100644
--- a/asio/.gitignore
+++ b/asio/.gitignore
@@ -11,6 +11,7 @@
 depcomp
 install-sh
 missing
+test-driver
 /doc
 /lib
 /boostified
diff --git a/asio/README b/asio/README
index 6ea1a72..10cf4e7 100644
--- a/asio/README
+++ b/asio/README
@@ -1,4 +1,4 @@
-asio version 1.8.1
-Released Tuesday, 10 July 2012.
+asio version 1.8.2
+Released Tuesday, 21 August 2012.
 
 See doc/index.html for API documentation and a tutorial.
diff --git a/asio/asio.manifest b/asio/asio.manifest
index 6216c39..2e9ec20 100644
--- a/asio/asio.manifest
+++ b/asio/asio.manifest
@@ -3425,6 +3425,7 @@
 /include/asio/detail/impl/win_thread.ipp
 /include/asio/detail/impl/win_tss_ptr.ipp
 /include/asio/detail/io_control.hpp
+/include/asio/detail/keyword_tss_ptr.hpp
 /include/asio/detail/kqueue_reactor_fwd.hpp
 /include/asio/detail/kqueue_reactor.hpp
 /include/asio/detail/local_free_on_block_exit.hpp
@@ -4002,3 +4003,4 @@
 /src/tests/unit/write.cpp
 /src/tools/
 /src/tools/handlerviz.pl
+/test-driver
diff --git a/asio/boost_asio.manifest b/asio/boost_asio.manifest
index 07835c6..d63ed08 100644
--- a/asio/boost_asio.manifest
+++ b/asio/boost_asio.manifest
@@ -112,6 +112,7 @@
 /boost/asio/detail/impl/win_thread.ipp
 /boost/asio/detail/impl/win_tss_ptr.ipp
 /boost/asio/detail/io_control.hpp
+/boost/asio/detail/keyword_tss_ptr.hpp
 /boost/asio/detail/kqueue_reactor_fwd.hpp
 /boost/asio/detail/kqueue_reactor.hpp
 /boost/asio/detail/local_free_on_block_exit.hpp
diff --git a/asio/configure.ac b/asio/configure.ac
index a5b2321..63fa919 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.8.1])
+AC_INIT(asio, [1.8.2])
 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 d86de93..f1227c4 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 100801 // 1.8.1
+#define ASIO_VERSION 100802 // 1.8.2
 
 #endif // ASIO_VERSION_HPP