diff --git a/README b/README
index 1a5259b..90ad382 100644
--- a/README
+++ b/README
@@ -78,5 +78,14 @@ Optional - compressed deployed files:
 	SDIMG_ROOTFS_TYPE = "ext3.xz"
 *Accommodate the values above to your own needs (ex: ext3 / ext4).
 
+Optional - GPU firmware:
+
+By default the GPU firmware shipped is arm192. You can overwrite this using the
+variable RPI_GPU_FIRMWARE with one of the values below.
+# arm128 : 128M ARM, 128M GPU split
+# arm192 : 192M ARM, 64M GPU split
+# arm224 : 224M ARM, 32M GPU split
+# arm240 : 240M ARM, 16M GPU split
+
 Layer maintainer: John Willis <John.Willis at distant-earth.com>
                   Andrei Gherzan <andrei at gherzan.ro>
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index aceac27..eaa42f9 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -37,11 +37,6 @@ IMAGE_ROOTFS_ALIGNMENT = "4096"
 SDIMG_ROOTFS_TYPE ?= "ext3"
 SDIMG_ROOTFS = "${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
 
-# Set GPU firmware image to be used
-# arm128 : 128M ARM, 128M GPU split
-# arm192 : 192M ARM, 64M GPU split
-# arm224 : 224M ARM, 32M GPU split
-# arm240 : 240M ARM, 16M GPU split
 RPI_GPU_FIRMWARE ?= "arm192"
 
 IMAGE_DEPENDS_rpi-sdimg = " \
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index db47ee2..4fd5c8c 100755
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -38,8 +38,5 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 	kernel-modules \
 "
 
-# Set GPU firmware image to be used
-# arm128 : 128M ARM, 128M GPU split
-# arm192 : 192M ARM, 64M GPU split
-# arm224 : 224M ARM, 32M GPU split
+# Set default GPU firmware image to be shipped
 RPI_GPU_FIRMWARE ?= "arm192"