diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 3e9e85f..ee4ebcb 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -61,6 +61,7 @@ BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
 # Audio
 AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
+AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true
 AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
 AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 USE_CUSTOM_AUDIO_POLICY := 1
diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml
index 231428b..88c026e 100644
--- a/audio/audio_effects.xml
+++ b/audio/audio_effects.xml
@@ -42,6 +42,7 @@
         <library name="offload_bundle" path="libqcompostprocbundle.so"/>
         <library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
         <library name="volume_listener" path="libvolumelistener.so"/>
+        <library name="dap" path="libswdap.so"/>
     </libraries>
     <effects>
         <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
@@ -88,6 +89,7 @@
         <effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/>
         <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>
         <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
+        <effect name="dap" library="dap" uuid="6ab06da4-c516-4611-8166-452799218539"/>
     </effects>
     <postprocess>
         <stream type="music">
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 1a39d78..1dbf739 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -18,12 +18,17 @@ vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so
 vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
 
 # Audio
+lib/libprofileparamstorage.so
 lib/librecordalive.so
 lib/libSamsungPostProcess.so
 lib/libSamsungPostProcessConvertor.so
 lib/libsamsungVoipResampler.so
+lib/libsecaudiocoreutils.so
 lib/lib_SamsungRec_06002.so
 lib/lib_SoundBooster_ver_Quad_710.so
+lib64/libprofileparamstorage.so
+lib64/libsecaudiocoreutils.so
+vendor/etc/dolby/dax-default.xml
 vendor/etc/SoundBoosterParam.txt
 vendor/lib/hw/audio.primary.msm8996.so
 vendor/lib/libacdb-fts.so
@@ -57,9 +62,11 @@ vendor/lib/soundfx/libasphere.so
 vendor/lib/soundfx/libqcbassboost.so
 vendor/lib/soundfx/libqcreverb.so
 vendor/lib/soundfx/libqcvirt.so
+vendor/lib/soundfx/libswdap.so
 vendor/lib64/soundfx/libasphere.so
 vendor/lib64/soundfx/libqcbassboost.so
 vendor/lib64/soundfx/libqcvirt.so
+vendor/lib64/soundfx/libswdap.so
 
 # Bluetooth
 vendor/bin/btnvtool
diff --git a/system.prop b/system.prop
index c2bc627..ae366bb 100755
--- a/system.prop
+++ b/system.prop
@@ -11,8 +11,6 @@ ro.config.media_vol_steps=25
 ro.config.vc_call_vol_steps=5
 ro.vendor.audio.sdk.fluencetype=none
 ro.vendor.audio.sdk.ssr=false
-vendor.audio.dolby.ds2.enabled=false
-vendor.audio.dolby.ds2.hardbypass=false
 vendor.audio.flac.sw.decoder.24bit=true
 vendor.audio_hal.period_size=192
 vendor.audio.hw.aac.encoder=true