diff --git a/src/clangll.rs b/src/clangll.rs
index b89c07569f..b974311769 100644
--- a/src/clangll.rs
+++ b/src/clangll.rs
@@ -392,6 +392,7 @@ pub const CXType_Dependent: c_uint = 26;
 pub const CXType_ObjCId: c_uint = 27;
 pub const CXType_ObjCClass: c_uint = 28;
 pub const CXType_ObjCSel: c_uint = 29;
+pub const CXType_Float128: c_uint = 30;
 pub const CXType_FirstBuiltin: c_uint = 2;
 pub const CXType_LastBuiltin: c_uint = 29;
 pub const CXType_Complex: c_uint = 100;
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 5e68da14a5..3bee69b6b9 100755
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -1609,27 +1609,22 @@ impl ToRustTy for Type {
                 }
             }
             TypeKind::Float(fk) => {
+                // TODO: we probably should just take the type layout into
+                // account?
+                //
+                // Also, maybe this one shouldn't be the default?
+                //
+                // FIXME: `c_longdouble` doesn't seem to be defined in some
+                // systems, so we use `c_double` directly.
                 use ir::ty::FloatKind;
-                if ctx.options().convert_floats {
-                    // TODO: we probably should just take the type layout into
-                    // account?
-                    //
-                    // Also, maybe this one shouldn't be the default?
-                    match fk {
-                        FloatKind::Float => aster::ty::TyBuilder::new().f32(),
-                        FloatKind::Double | FloatKind::LongDouble => {
-                            aster::ty::TyBuilder::new().f64()
-                        }
-                    }
-                } else {
-                    // FIXME: `c_longdouble` doesn't seem to be defined in some
-                    // systems, so we use `c_double` directly.
-                    match fk {
-                        FloatKind::Float => raw!(c_float),
-                        FloatKind::Double | FloatKind::LongDouble => {
-                            raw!(c_double)
-                        }
-                    }
+                match (fk, ctx.options().convert_floats) {
+                    (FloatKind::Float, true) => aster::ty::TyBuilder::new().f32(),
+                    (FloatKind::Double, true) |
+                    (FloatKind::LongDouble, true) => aster::ty::TyBuilder::new().f64(),
+                    (FloatKind::Float, false) => raw!(c_float),
+                    (FloatKind::Double, false) |
+                    (FloatKind::LongDouble, false) => raw!(c_double),
+                    (FloatKind::Float128, _) => aster::ty::TyBuilder::new().array(16).u8(),
                 }
             }
             TypeKind::Function(ref fs) => {
diff --git a/src/ir/context.rs b/src/ir/context.rs
index 00ece52975..92c6fb4983 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -697,6 +697,7 @@ impl<'ctx> BindgenContext<'ctx> {
             CXType_Float => TypeKind::Float(FloatKind::Float),
             CXType_Double => TypeKind::Float(FloatKind::Double),
             CXType_LongDouble => TypeKind::Float(FloatKind::LongDouble),
+            CXType_Float128 => TypeKind::Float(FloatKind::Float128),
             _ => return None,
         };
 
diff --git a/src/ir/ty.rs b/src/ir/ty.rs
index 77dc61be6d..5a72eb2233 100644
--- a/src/ir/ty.rs
+++ b/src/ir/ty.rs
@@ -363,6 +363,8 @@ pub enum FloatKind {
     Double,
     /// A `long double`.
     LongDouble,
+    /// A `__float128`.
+    Float128,
 }
 
 /// The different kinds of types that we can parse.
@@ -771,7 +773,10 @@ impl Type {
                                            ctx);
             }
             _ => {
-                error!("unsupported type {:?} at {:?}", ty, location);
+                error!("unsupported type: kind = {:?}; ty = {:?}; at {:?}",
+                       ty.kind(),
+                       ty,
+                       location);
                 return Err(ParseError::Continue);
             }
         };
diff --git a/tests/expectations/tests/float128.rs b/tests/expectations/tests/float128.rs
new file mode 100644
index 0000000000..b4b7b2bcee
--- /dev/null
+++ b/tests/expectations/tests/float128.rs
@@ -0,0 +1,7 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+
diff --git a/tests/headers/float128.hpp b/tests/headers/float128.hpp
new file mode 100644
index 0000000000..f554e88e1a
--- /dev/null
+++ b/tests/headers/float128.hpp
@@ -0,0 +1,13 @@
+// FIXME: libclang < 3.9 does not expose `__float128` in its interface, so this
+// test will fail. Once we remove support for `--features llvm_stable` and
+// require libclang >= 3.9, we can reenable this test.
+//
+// static __float128 global = 1.0;
+
+// FIXME: We have no way to get 128 bit aligned structs in Rust at the moment,
+// and therefore the generated layout tests for this struct will fail. When we
+// can enforce 128 bit alignment, we can re-enable this test.
+//
+// struct A {
+//     __float128 f;
+// };