diff --git a/CMakeLists.txt b/CMakeLists.txt
index 663467e7..b793e6ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ if ("${LIBCXX_CXX_ABI}" STREQUAL "libsupc++")
   set(LIBCXX_LIBSUPCXX_INCLUDE_PATHS "${LIBCXX_LIBSUPCXX_INCLUDE_PATHS}"
       CACHE STRINGS
       "Paths to libsupc++ include directories separate by ';'.")
-  set(LIBCXX_CXX_ABI_LIBRARIES stdc++)
+  set(LIBCXX_CXX_ABI_LIBRARIES supc++)
   set(LIBCXX_LIBSUPCXX_FILES
       cxxabi.h
       bits/c++config.h
diff --git a/include/__config b/include/__config
index 203be761..8617b866 100644
--- a/include/__config
+++ b/include/__config
@@ -66,6 +66,12 @@
 #  endif
 #endif  // _WIN32
 
+#ifdef __linux__
+#  if defined(__GNUC__) && _GNUC_VER >= 403
+#    define _LIBCP_HAS_IS_BASE_OF
+#  endif
+#endif
+
 #ifdef __sun__
 # include <sys/isa_defs.h>
 # ifdef _LITTLE_ENDIAN
diff --git a/test/lit.cfg b/test/lit.cfg
index 8121da13..512935c3 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -146,7 +146,7 @@ else:
     cxx_has_stdcxx0x_flag = getattr(config, 'cxx_has_stdcxx0x_flag', True)
 
 # Configure extra compiler flags.
-include_paths = ['-I' + libcxx_src_root + '/include']
+include_paths = ['-I' + libcxx_src_root + '/include', '-I' + libcxx_src_root + '/test/support']
 library_paths = ['-L' + libcxx_obj_root + '/lib']
 compile_flags = []
 if cxx_has_stdcxx0x_flag: