diff --git a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
index c0e204d..285f5ab 100755
--- a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
+++ b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
@@ -3,11 +3,10 @@ LICENSE = "proprietary-binary"
 
 LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=e86e693d19572ee64cc8b17fb062faa9"
 
-# This is on the master branch
-SRCREV = "56cd7ffb3f7244017c8eb3b492ea37592c678506"
+include ../common/firmware.inc
 
 SRC_URI = " \
-        git://github.com/raspberrypi/firmware.git;protocol=git;branch=master  \    
+        git://github.com/raspberrypi/firmware.git;protocol=git;branch=master  \
 "
 
 S = "${WORKDIR}/git/boot"
@@ -23,7 +22,7 @@ do_deploy() {
 	done
 	for i in *.bin ; do
 		cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
-	done	
+	done
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bcm/common/firmware.inc b/recipes-bcm/common/firmware.inc
new file mode 100644
index 0000000..89192a2
--- /dev/null
+++ b/recipes-bcm/common/firmware.inc
@@ -0,0 +1,8 @@
+
+# 21/06/2012 firmware; this can be overridden from distro config
+RPIFW_SRCREV ?= "fc0232ac463f0618914bab9314e8e2ae27466d8c"
+RPIFW_DATE ?= "20120621"
+
+
+SRCREV = "${RPIFW_SRCREV}"
+PV = "${RPIFW_DATE}"
\ No newline at end of file
diff --git a/recipes-bcm/vc-graphics/vc-graphics.inc b/recipes-bcm/vc-graphics/vc-graphics.inc
index dcb0984..19ce4ba 100644
--- a/recipes-bcm/vc-graphics/vc-graphics.inc
+++ b/recipes-bcm/vc-graphics/vc-graphics.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=86e53f5f5909ee66900418028de11780"
 
 PROVIDES += "virtual/egl"
 
-SRCREV = "1178c4db57e8676f331fdacfb37ff1662430ea5f"
+include ../common/firmware.inc
 
 SRC_URI = "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master\
            file://egl.pc"