diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index ef27ac6..af18aab 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -8,8 +8,6 @@
 #    BOOT_SPACE - SDIMG_SIZE  - rootfs
 #
 
-inherit image_types
-
 # Set kernel and boot loader
 IMAGE_BOOTLOADER ?= "bcm2835-bootfiles"
 
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index 4508a42..a64104b 100755
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -9,6 +9,7 @@ require conf/machine/include/tune-arm1176jzf-s.inc
 
 GUI_MACHINE_CLASS = "bigscreen"
 
+INHERIT += "sdcard_image-rpi"
 IMAGE_FSTYPES += "tar.bz2 ext3 rpi-sdimg"
 
 SERIAL_CONSOLE = "115200 ttyAMA0"