diff --git a/conf/machine/pcontrolg20.conf b/conf/machine/pcontrolg20.conf
new file mode 100644
index 0000000..9710de9
--- /dev/null
+++ b/conf/machine/pcontrolg20.conf
@@ -0,0 +1,39 @@
+#@TYPE: Machine
+#@Name: PControl G20
+#@DESCRIPTION: Machine configuration for the PControl_G20 with Taskit Stamp9g20.
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 ext2 ethernet serial mmc"
+MACHINE_FEATURES += "usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "noscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+MACHINE_EXTRA_RRECOMMENDS = " \
+    "
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_classpath = "classpath-minimal"
+PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
+
+#don't try to access tty1
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+IMAGE_FSTYPES = "tar.gz jffs2"
+
+IMAGE_ROOTFS_SIZE = "1927168"
+
+module_autoload_plat_ram   = "plat_ram"
+module_autoload_uio_pdrv   = "uio_pdrv"
+module_autoload_w1_gpio    = "w1_gpio"
+module_autoload_i2c_gpio   = "i2c_gpio"
+module_autoload_g_ether    = "g_ether"
+
+require conf/machine/include/tune-arm926ejs.inc