diff --git a/tools/make-firmware-image b/tools/make-firmware-image
index 87e55cf1..0c470840 100755
--- a/tools/make-firmware-image
+++ b/tools/make-firmware-image
@@ -33,8 +33,7 @@ case $CODENAME in
 		GENERATE_DEP11=0
 		;;
 	*)
-		# FIXME: drop non-free when we no longer need it
-		export FIRMWARE_COMPONENTS="main non-free non-free-firmware"
+		export FIRMWARE_COMPONENTS="main non-free-firmware"
 		GENERATE_DEP11=1
 		;;
 esac