diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf
new file mode 100644
index 0000000..34e3a74
--- /dev/null
+++ b/conf/machine/cgtqmx6.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: Congatec Qmx6
+#@DESCRIPTION: Machine configuration for Congatec Qmx6 board
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6q:mx6"
+
+# Use u-boot imx
+UBOOT_SUFFIX = "bin"
+UBOOT_PADDING = "2"
+PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+
+UBOOT_MACHINE = "cgtqmx6_config"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+MACHINE_FEATURES += " pci"