diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 604c6ba6b0..bf6af2b838 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -76,7 +76,7 @@ def siteinfo_data(d):
         "x86_64-linux": "bit-64",
         "x86_64-linux-uclibc": "bit-64",
         "x86_64-linux-gnu": "bit-64 x86_64-linux",
-        "x86_64-linux-gnux32": "bit-32 ix86-common",
+        "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux",
         "x86_64-mingw32": "bit-64",
     }
 
diff --git a/meta/site/x32-linux b/meta/site/x32-linux
new file mode 100644
index 0000000000..7ce6551ecd
--- /dev/null
+++ b/meta/site/x32-linux
@@ -0,0 +1,9 @@
+# general
+ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=16}
+ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
+ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
+ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
+ac_cv_sys_file_offset_bits=${ac_cv_sys_file_offset_bits=64}
+
+# glib
+glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=32}