diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
new file mode 100644
index 0000000..dc64d89
--- /dev/null
+++ b/conf/machine/include/wandboard.inc
@@ -0,0 +1,10 @@
+# Common settings for wandboard boards
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FEATURES += "pci"
diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
index 3526790..bf2ba8d 100644
--- a/conf/machine/wandboard-dual.conf
+++ b/conf/machine/wandboard-dual.conf
@@ -3,19 +3,14 @@
 #@SOC: i.MX6DL
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Duallite
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6dl:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_dl_config"
 
 KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
 
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "bluetooth wifi"
 
 MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-quad.conf b/conf/machine/wandboard-quad.conf
index 578dd0d..1523887 100644
--- a/conf/machine/wandboard-quad.conf
+++ b/conf/machine/wandboard-quad.conf
@@ -3,19 +3,14 @@
 #@SOC: i.MX6Q
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6q:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_quad_config"
 
 KERNEL_DEVICETREE = "imx6q-wandboard.dtb"
 
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "bluetooth wifi"
 
 MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
index aad7876..9696aeb 100644
--- a/conf/machine/wandboard-solo.conf
+++ b/conf/machine/wandboard-solo.conf
@@ -3,17 +3,10 @@
 #@SOC: i.MX6S
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6s:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_solo_config"
 
 KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi"