diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
new file mode 100644
index 00000000..51e4a84b
--- /dev/null
+++ b/conf/machine/include/omap4.inc
@@ -0,0 +1,25 @@
+SOC_FAMILY = "omap4"
+
+require conf/machine/include/tune-cortexa8.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap4"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xserver-xorg-extension-dri \
+           xserver-xorg-extension-dri2 \
+           xserver-xorg-extension-glx \
+           xf86-input-evdev \
+           xf86-video-fbdev" 
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r0"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+
diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf
new file mode 100644
index 00000000..2c37b4fa
--- /dev/null
+++ b/conf/machine/pandaboard.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Pandaboard
+#@DESCRIPTION: Machine configuration for the OMAP4430 Panda
+
+require conf/machine/include/omap4.inc
+
+UBOOT_MACHINE = "omap4_panda_config"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+IMAGE_FSTYPES += "tar.bz2"
+
+SERIAL_CONSOLE = "115200 ttyO2"
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat"
+
+