diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index 0537980f5..d03754488 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -15,7 +15,10 @@ COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
 ARCHITECTURES="?x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"
 SOURCE_DIR="boost_1_55_0"	
-PATCHES="boost-1.55.0.patch"
+PATCHES="
+	boost-1.55.0.patch
+	type_traits.patch
+"
 DISABLE_SOURCE_PACKAGE=yes
 
 PROVIDES="
diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch
new file mode 100644
index 000000000..a2c26785d
--- /dev/null
+++ b/dev-libs/boost/patches/type_traits.patch
@@ -0,0 +1,26 @@
+diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
+index 1b15c7e..e953f00 100644
+--- a/boost/config/platform/haiku.hpp
++++ b/boost/config/platform/haiku.hpp
+@@ -10,13 +10,21 @@
+ #define BOOST_PLATFORM "Haiku"
+ 
+ #define BOOST_NO_INTRINSIC_WCHAR_T
++#define BOOST_NO_STD_WSTRING
+ #define BOOST_HAS_UNISTD_H
++#define BOOST_EXCEPTION_DISABLE
++#define BOOST_NO_EXCEPTIONS
++#define BOOST_NO_AUTO_PTR
++#define GLIBC_HAVE_LONG_LONG
+ 	
+ #define BOOST_HAS_BETHREADS
+ 	
+ #ifndef BOOST_DISABLE_THREADS
+ #   define BOOST_HAS_THREADS
+ #endif
++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR
++
+ 
+ //
+ // thread API's not auto detected: