diff --git a/Config.in b/Config.in
index afcdd00bf4a..df8bc993ccc 100644
--- a/Config.in
+++ b/Config.in
@@ -43,7 +43,7 @@ menu "Target Images"
 		  
 	config TARGET_ROOTFS_CPIOGZ
 		bool "cpiogz"
-		default y if USES_TGZ
+		default y if USES_CPIOGZ
 		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a compressed cpio archive of the the root filesystem
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 2898289bcc2..6d753451967 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -159,6 +159,7 @@ sub target_config_features(@) {
 		/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
 		/ext2/ and $ret .= "\tselect USES_EXT2\n";
 		/tgz/ and $ret .= "\tselect USES_TGZ\n";
+		/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
 	}
 	return $ret;
 }
diff --git a/target/Config.in b/target/Config.in
index 2dc5ec4245b..aabe9c3034e 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -35,6 +35,9 @@ config USES_EXT2
 config USES_TGZ
 	bool
 
+config USES_CPIOGZ
+	bool
+
 config PROFILE_KCONFIG 
 	bool