diff --git a/include/boost/type_traits/arithmetic_traits.hpp b/include/boost/type_traits/arithmetic_traits.hpp
index 2436431..c31ce2e 100644
--- a/include/boost/type_traits/arithmetic_traits.hpp
+++ b/include/boost/type_traits/arithmetic_traits.hpp
@@ -236,22 +236,22 @@ template <> struct is_float<const volatile long double>
 template <typename T> 
 struct is_arithmetic
 { 
-	BOOST_STATIC_CONSTANT(bool, value = 
-		(::boost::type_traits::ice_or< 
-			::boost::is_integral<T>::value,
-			::boost::is_float<T>::value
-		>::value)); 
+   BOOST_STATIC_CONSTANT(bool, value = 
+      (::boost::type_traits::ice_or< 
+         ::boost::is_integral<T>::value,
+         ::boost::is_float<T>::value
+      >::value)); 
 };
 
 //* is a type T a fundamental type described in the standard (3.9.1)
 template <typename T> 
 struct is_fundamental
 { 
-	BOOST_STATIC_CONSTANT(bool, value = 
-		(::boost::type_traits::ice_or< 
-			::boost::is_arithmetic<T>::value, 
-			::boost::is_void<T>::value
-		>::value)); 
+   BOOST_STATIC_CONSTANT(bool, value = 
+      (::boost::type_traits::ice_or< 
+         ::boost::is_arithmetic<T>::value, 
+         ::boost::is_void<T>::value
+      >::value)); 
 };
 
 } // namespace boost
diff --git a/include/boost/type_traits/composite_traits.hpp b/include/boost/type_traits/composite_traits.hpp
index 004715b..c9d9e42 100644
--- a/include/boost/type_traits/composite_traits.hpp
+++ b/include/boost/type_traits/composite_traits.hpp
@@ -11,7 +11,7 @@
 //
 //    Fixed is_pointer, is_reference, is_const, is_volatile, is_same, 
 //    is_member_pointer based on the Simulated Partial Specialization work 
-//    of Mat Marcus and Jesse Jones. See 	http://opensource.adobe.com or 
+//    of Mat Marcus and Jesse Jones. See  http://opensource.adobe.com or 
 //    http://groups.yahoo.com/group/boost/message/5441 
 //    Some workarounds in here use ideas suggested from "Generic<Programming>: 
 //    Mappings between Types and Values" 
diff --git a/include/boost/type_traits/conversion_traits.hpp b/include/boost/type_traits/conversion_traits.hpp
index cfdbb15..53eeccb 100644
--- a/include/boost/type_traits/conversion_traits.hpp
+++ b/include/boost/type_traits/conversion_traits.hpp
@@ -233,7 +233,14 @@ struct is_convertible<void, void>
 template <class Base, class Derived>
 struct is_base_and_derived
 {
-   BOOST_STATIC_CONSTANT(bool, value = (::boost::is_convertible<Derived*,Base*>::value));
+   BOOST_STATIC_CONSTANT(bool, value =
+      (::boost::type_traits::ice_and<
+         ::boost::is_convertible<Derived*,Base*>::value,
+         ::boost::type_traits::ice_not<
+            ::boost::is_void<Base>::value
+         >::value
+      >::value)
+   );
 };
 
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
diff --git a/include/boost/type_traits/type_traits_test.hpp b/include/boost/type_traits/type_traits_test.hpp
index a6f1cd0..c8feddf 100644
--- a/include/boost/type_traits/type_traits_test.hpp
+++ b/include/boost/type_traits/type_traits_test.hpp
@@ -34,9 +34,9 @@ int check_result(int argc, char** argv)
       << failures << " failures found, "
       << expected_failures << " failures expected from this compiler." << std::endl;
    if((argc == 2) 
-   	&& (argv[1][0] == '-')
-   	&& (argv[1][1] == 'a')
-   	&& (argv[1][2] == 0))
+      && (argv[1][0] == '-')
+      && (argv[1][1] == 'a')
+      && (argv[1][2] == 0))
    {
       std::cout << "Press any key to continue...";
       std::cin.get();
diff --git a/tests/object_type_traits_test.cpp b/tests/object_type_traits_test.cpp
index d33dcb3..5ac99c8 100644
--- a/tests/object_type_traits_test.cpp
+++ b/tests/object_type_traits_test.cpp
@@ -21,9 +21,9 @@ NESTED_DECL(is_POD)
 
 struct non_default_constructable_UDT
 {
-	non_default_constructable_UDT(const non_default_constructable_UDT&){}
+   non_default_constructable_UDT(const non_default_constructable_UDT&){}
 private:
-	non_default_constructable_UDT(){}
+   non_default_constructable_UDT(){}
 };
 
 int cpp_main(int argc, char* argv[])
diff --git a/tools/specialisations.cpp b/tools/specialisations.cpp
index b4f76b5..5863547 100644
--- a/tools/specialisations.cpp
+++ b/tools/specialisations.cpp
@@ -118,4 +118,4 @@ int main()
 
 
    return 0;
-}
\ No newline at end of file
+}