diff --git a/partition.cpp b/partition.cpp
index b6e789ba..5626e5c4 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -158,6 +158,7 @@ enum TW_FSTAB_FLAGS {
 	TWFLAG_FORMATTABLE,
 	TWFLAG_RESIZE,
 	TWFLAG_KEYDIRECTORY,
+	TWFLAG_WRAPPEDKEY,
 };
 
 /* Flags without a trailing '=' are considered dual format flags and can be
@@ -202,6 +203,7 @@ const struct flag_list tw_flags[] = {
 	{ "formattable",            TWFLAG_FORMATTABLE },
 	{ "resize",                 TWFLAG_RESIZE },
 	{ "keydirectory=",          TWFLAG_KEYDIRECTORY },
+	{ "wrappedkey",             TWFLAG_WRAPPEDKEY },
 	{ 0,                        0 },
 };
 
@@ -883,6 +885,13 @@ void TWPartition::Apply_TW_Flag(const unsigned flag, const char* str, const bool
 				LOGINFO("FBE contents '%s', filenames '%s'\n", FBE_contents.c_str(), FBE_filenames.c_str());
 			}
 			break;
+		case TWFLAG_WRAPPEDKEY:
+			// Set fbe.data.wrappedkey to true
+			{
+				property_set("fbe.data.wrappedkey", "true");
+				LOGINFO("FBE wrapped key enabled\n");
+			}
+			break;
 		case TWFLAG_FLASHIMG:
 			Can_Flash_Img = val;
 			break;