diff --git a/Android.mk b/Android.mk
index 0d2708d4..a0603515 100755
--- a/Android.mk
+++ b/Android.mk
@@ -411,6 +411,9 @@ endif
 ifneq ($(TW_BACKUP_EXCLUSIONS),)
 	LOCAL_CFLAGS += -DTW_BACKUP_EXCLUSIONS='"$(TW_BACKUP_EXCLUSIONS)"'
 endif
+ifeq ($(TW_INCLUDE_FASTBOOTD), true)
+    LOCAL_CFLAGS += -DTW_INCLUDE_FASTBOOTD
+endif
 
 LOCAL_C_INCLUDES += system/vold \
 
diff --git a/data.cpp b/data.cpp
index 7661d69e..4e32dc4b 100755
--- a/data.cpp
+++ b/data.cpp
@@ -719,6 +719,10 @@ void DataManager::SetDefaultValues()
 	printf("TW_HAS_EDL_MODE := true\n");
 	mConst.SetValue(TW_EDL_MODE, "1");
 #endif
+#ifdef TW_INCLUDE_FASTBOOTD
+	printf("TW_INCLUDE_FASTBOOTD := true\n");
+	mConst.SetValue(TW_FASTBOOT_MODE, "1");
+#endif
 #ifdef PRODUCT_USE_DYNAMIC_PARTITIONS
 	printf("PRODUCT_USE_DYNAMIC_PARTITIONS := true\n");
 	mConst.SetValue(TW_FASTBOOT_MODE, "1");