diff --git a/config/noobs/partition_setup.sh b/config/noobs/partition_setup.sh
index 50577f5e6b..7f0e5344db 100755
--- a/config/noobs/partition_setup.sh
+++ b/config/noobs/partition_setup.sh
@@ -46,7 +46,7 @@ fi
 
 # create bootloader configuration
   echo "creating bootloader configuration..."
-  echo "boot=$id1 disk=$id2 quiet" > $MOUNTPOINT/cmdline.txt
+  echo "boot=$id1 disk=$id2 quiet @EXTRA_CMDLINE@" > $MOUNTPOINT/cmdline.txt
 
 # cleanup mountpoint
   umount $MOUNTPOINT
diff --git a/scripts/image b/scripts/image
index c309c7a049..d0fb3825a7 100755
--- a/scripts/image
+++ b/scripts/image
@@ -407,6 +407,9 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
         -e "s%@SYSTEM_SIZE@%${SYSTEM_SIZE}%g" \
         -i ${RELEASE_DIR}/${NOOBS_DISTRO}/partitions.json
 
+    sed -e "s%@EXTRA_CMDLINE@%${EXTRA_CMDLINE}%g" \
+        -i ${RELEASE_DIR}/${NOOBS_DISTRO}/partition_setup.sh
+
     # Create System dir
     mkdir -p ${RELEASE_DIR}/${NOOBS_DISTRO}/System