diff --git a/BoardConfig9610.mk b/BoardConfig9610.mk
index 3bb0e90..edb59d9 100644
--- a/BoardConfig9610.mk
+++ b/BoardConfig9610.mk
@@ -27,6 +27,12 @@
 BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
 BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
 
+# Audio
+ifeq ($(BOARD_VENDOR), samsung)
+BOARD_USE_COMMON_AUDIOHAL := true
+BOARD_USE_AUDIOHAL := true
+endif
+
 # Samsung OpenMAX Video
 BOARD_USE_DMA_BUF := true
 BOARD_USE_NON_CACHED_GRAPHICBUFFER := true
diff --git a/BoardConfig9820.mk b/BoardConfig9820.mk
index eef1b46..5b7cf1f 100644
--- a/BoardConfig9820.mk
+++ b/BoardConfig9820.mk
@@ -27,6 +27,10 @@
 BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
 BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
 
+# Audio
+BOARD_USE_COMMON_AUDIOHAL := true
+BOARD_USE_AUDIOHAL := true
+
 # Samsung OpenMAX Video
 BOARD_USE_DMA_BUF := true
 BOARD_USE_NON_CACHED_GRAPHICBUFFER := true