diff --git a/product_prop.mk b/product_prop.mk
index 521e871..9acd6b3 100644
--- a/product_prop.mk
+++ b/product_prop.mk
@@ -2,6 +2,10 @@
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 
+# fastbootd
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.fastbootd.available=true
+
 # Graphics
 PRODUCT_PRODUCT_PROPERTIES += \
     debug.sf.latch_unsignaled=1
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 4f62195..b28f27b 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -35,6 +35,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml
 
+# Recovery
+PRODUCT_PACKAGES += \
+    fastbootd
+
 # SamsungDoze
 PRODUCT_PACKAGES += \
     SamsungDoze