diff --git a/conf/machine/arduino-101.conf b/conf/machine/arduino-101.conf
new file mode 100644
index 0000000..543a41e
--- /dev/null
+++ b/conf/machine/arduino-101.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: arduino-101
+
+#@DESCRIPTION: Machine configuration for Arduino 101 Board.
+
+TARGET_OS_arduino-101 = "elfiamcu"
+require conf/machine/include/tune-iamcu.inc
+TUNE_PKGARCH_arduino-101 = "iamcu"
+
+TARGET_LINK_HASH_STYLE = ""
diff --git a/conf/machine/include/tune-iamcu.inc b/conf/machine/include/tune-iamcu.inc
new file mode 100644
index 0000000..59160c3
--- /dev/null
+++ b/conf/machine/include/tune-iamcu.inc
@@ -0,0 +1,19 @@
+DEFAULTTUNE ?= "iamcu"
+
+TARGET_OS_iamcu = "elfiamcu"
+TARGET_ARCH = "i586"
+
+TUNE_FEATURES_tune-iamcu = "iamcu"
+TUNE_CCARGS = "-miamcu -m32"
+TUNE_ARCH = "i586"
+TUNEVALID[iamcu] = "Intel MCU"
+
+def iamcu_siteinfo_setfunc(archinfo, osinfo, targetinfo, d):
+	archinfo['iamcu'] = "endian-little bit-32 "
+	osinfo['linux'] = "common-linux common-glibc"
+	targetinfo['iamcu-linux'] = "iamcu-linux"
+	return archinfo, osinfo, targetinfo
+
+SITEINFO_EXTRA_DATAFUNCS = "iamcu_siteinfo_setfunc"
+PACKAGE_EXTRA_ARCHS_tune-iamcu = "iamcu"
+