diff --git a/proprietary-files.txt b/proprietary-files.txt
index 2aa79c2..4b1fa9f 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1008,7 +1008,7 @@ vendor/etc/wifi/aoa_cldb_falcon.bin
 vendor/etc/wifi/aoa_cldb_swl14.bin
 
 # WiFi Display - from lemonadep - SKQ1.210821.001
--framework/WfdCommon.jar|9f431b56d7f38c71089333008695dd5f717e5034
+-system/framework/WfdCommon.jar|9f431b56d7f38c71089333008695dd5f717e5034
 -system_ext/priv-app/WfdService/WfdService.apk|381e93aaa1943526cbeb9957656b5a0622b589d6
 
 # WiFi Display
diff --git a/resource-overlay/common/Frameworks/res/values/config.xml b/resource-overlay/common/Frameworks/res/values/config.xml
index 985ed64..cf94ffc 100644
--- a/resource-overlay/common/Frameworks/res/values/config.xml
+++ b/resource-overlay/common/Frameworks/res/values/config.xml
@@ -299,4 +299,18 @@
 
     <!-- Configure emergency apn as empty(null) apn -->
     <string name="config_emergency_apn" translatable="false"></string>
+
+    <!-- Whether WiFi display is supported by this device.
+         There are many prerequisites for this feature to work correctly.
+         Here are a few of them:
+         * The WiFi radio must support WiFi P2P.
+         * The WiFi radio must support concurrent connections to the WiFi display and
+           to an access point.
+         * The Audio Server audio_policy_configuration.xml file must specify a rule for
+           the "r_submix" remote submix module.  This module is used to record and stream system
+           audio output to the WiFi display encoder in the media server.
+         * The remote submix module "audio.r_submix.default" must be installed on the device.
+         * The device must be provisioned with HDCP keys (for protected content).
+    -->
+    <bool name="config_enableWifiDisplay">true</bool>
 </resources>
diff --git a/system.prop b/system.prop
index c42c664..dda9386 100644
--- a/system.prop
+++ b/system.prop
@@ -46,6 +46,10 @@ persist.vendor.data.mode=concurrent
 # Vendor
 ro.vendor.qti.va_aosp.support=1
 
+# WFD
+persist.debug.wfd.enable=1
+persist.sys.wfd.virtual=0
+
 # Zygote
 persist.device_config.runtime_native.usap_pool_enabled=true