diff --git a/configure.ac b/configure.ac
index 9bf808990f2..cc7236824c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,7 +364,8 @@ AC_CHECK_HEADER([boost/statechart/state.hpp], [],
 # If we have the boost system library installed, then we may want to link
 # with it.
 AC_CHECK_LIB(boost_system-mt, main, [],
-    AC_MSG_NOTICE(["Boost system library not found."]))
+    [AC_CHECK_LIB(boost_system, main, [],
+        AC_MSG_NOTICE(["Boost system library not found."]))])
 
 AC_LANG([C])
 
diff --git a/src/leveldb b/src/leveldb
index f2d406b4213..be23f7880b6 160000
--- a/src/leveldb
+++ b/src/leveldb
@@ -1 +1 @@
-Subproject commit f2d406b4213a22bfed3acfdb071fbec9ca9205cc
+Subproject commit be23f7880b64514de1c727b86f0ccefe5540519e