diff --git a/asio/README b/asio/README
index 212c5977..6a1d33c4 100644
--- a/asio/README
+++ b/asio/README
@@ -1,4 +1,4 @@
-asio version 1.1.1
-Released Thursday, 3 July 2008.
+asio version 1.2.0
+Released Thursday, 14 August 2008.
 
 See doc/index.html for API documentation and a tutorial.
diff --git a/asio/configure.ac b/asio/configure.ac
index 02354ddb..eebcae49 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.1.1])
+AC_INIT(asio, [1.2.0])
 AC_CONFIG_SRCDIR(include/asio.hpp)
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE([tar-ustar])
@@ -17,25 +17,30 @@ AC_ARG_WITH(boost,
   CPPFLAGS="$CPPFLAGS -I${withval}"
 ],
 [
-  BOOSTDIR="`pwd`/../boost_1_35_0"
+  BOOSTDIR="`pwd`/../boost_1_36_0"
   if test -d "${BOOSTDIR}"; then
     CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
   else
-    BOOSTDIR="`pwd`/../boost_1_34_1"
+    BOOSTDIR="`pwd`/../boost_1_35_0"
     if test -d "${BOOSTDIR}"; then
       CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
     else
-      BOOSTDIR="`pwd`/../boost_1_34_0"
+      BOOSTDIR="`pwd`/../boost_1_34_1"
       if test -d "${BOOSTDIR}"; then
         CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
       else
-        BOOSTDIR="`pwd`/../boost_1_33_1"
+        BOOSTDIR="`pwd`/../boost_1_34_0"
         if test -d "${BOOSTDIR}"; then
           CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
         else
-          BOOSTDIR="`pwd`/../boost_1_33_0"
+          BOOSTDIR="`pwd`/../boost_1_33_1"
           if test -d "${BOOSTDIR}"; then
             CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
+          else
+            BOOSTDIR="`pwd`/../boost_1_33_0"
+            if test -d "${BOOSTDIR}"; then
+              CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}"
+            fi
           fi
         fi
       fi
diff --git a/asio/include/asio/version.hpp b/asio/include/asio/version.hpp
index 98e1815b..827fa947 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 100101 // 1.1.1
+#define ASIO_VERSION 100200 // 1.2.0
 
 #endif // ASIO_VERSION_HPP