diff --git a/iopsys-brcm63xx-arm/Makefile b/iopsys-brcm63xx-arm/Makefile
index 8b64d7e73713c79c2d2f602d823b77b95a415882..e73b779c9b74535a8f40e62df8f34e8fdcc4f34c 100644
--- a/iopsys-brcm63xx-arm/Makefile
+++ b/iopsys-brcm63xx-arm/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=iopsys-brcm63xx-arm
 BOARDNAME:=IOPSYS Broadcom ARM
-FEATURES:=usb jffs2_nand nand ubifs
+FEATURES:=
 MAINTAINER:=Benjamin Larsson <benjamin.larsson@iopsys.eu>
 CFLAGS:=-Os -pipe -mfpu=vfpv3-d16 -mfloat-abi=softfp
 CFLAGS += -DCONFIG_TARGET_iopsys_brcm63xx_arm
diff --git a/iopsys-brcm63xx-arm/image/Makefile b/iopsys-brcm63xx-arm/image/Makefile
index d58bc5717d4a6dff9842ea67f5c52826aa705c19..06d966ee56a604caa3c7cc4783683cd5acca95bb 100644
--- a/iopsys-brcm63xx-arm/image/Makefile
+++ b/iopsys-brcm63xx-arm/image/Makefile
@@ -440,6 +440,17 @@ endif
 
 endef
 
+# Fill in the TARGET_FILESYSTEMS variable, used by include/image.mk
+# There is a loop iterating on it there, which will call Image/Build.
+# As we do not use the toplevel config options for the rootfs types in
+# this makefile, this is a good way to achieve something equivalent to
+# how a "more usual" image makefile would be called from the build system.
+TARGET_FILESYSTEMS += BCM_PKGTB
+
+# For the next soul wandering here: Keep the empty newlines
+# in this function. Otherwise make will complain about an
+# extraneous 'endif' in the makefile, and you will lose all
+# your hair while debugging this...
 define Image/Build
 
     ifdef CONFIG_TARGET_IMAGE_FIT