diff --git a/msm8974.mk b/msm8974.mk
index 0deebb1..f1193f7 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -94,6 +94,10 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service
 
+# fastbootd
+PRODUCT_PACKAGES += \
+    fastbootd
+
 # Gatekeeper
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-service.software
diff --git a/sepolicy/common/fastbootd.te b/sepolicy/common/fastbootd.te
new file mode 100644
index 0000000..742f31e
--- /dev/null
+++ b/sepolicy/common/fastbootd.te
@@ -0,0 +1,5 @@
+recovery_only(`
+userdebug_or_eng(`
+permissive fastbootd;
+')
+')
diff --git a/system.prop b/system.prop
index f04803a..07daf3c 100644
--- a/system.prop
+++ b/system.prop
@@ -3,6 +3,9 @@ audio.offload.buffer.size.kb=32
 audio.offload.gapless.enabled=false
 av.offload.enable=true
 
+# fastbootd
+ro.fastbootd.available=true
+
 # GL
 ro.opengles.version=196608