diff --git a/configure.ac b/configure.ac
index cf2e955..2228410 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,11 @@
                 [Enable conditional compile for target msm8953 [default=no]]),
         [target_msm8953="${enableval}"])
 
+AC_ARG_ENABLE([target-msm8996],
+        AC_HELP_STRING([--enable-target-msm8996],
+                [Enable conditional compile for target msm8996 [default=no]]),
+        [target_msm8996="${enableval}"])
+
 AC_ARG_ENABLE([target-msm8610],
         AC_HELP_STRING([--enable-target-msm8610],
                 [Enable conditional compile for target msm8610 [default=no]]),
@@ -133,6 +138,7 @@
         [CPPFLAGS="$CPPFLAGS -I$withval"])
 
 AM_CONDITIONAL(TARGET_MSM8953, [test "x$target_msm8953" = "xyes"])
+AM_CONDITIONAL(TARGET_MSM8996, [test "x$target_msm8996" = "xyes"])
 AM_CONDITIONAL(TARGET_MSM8610, [test "x$target_msm8610" = "xyes"])
 AM_CONDITIONAL(TARGET_MSM8226, [test "x$target_msm8226" = "xyes"])
 AM_CONDITIONAL(TARGETS_THAT_SUPPORT_UBWC, [test "x$targets_that_support_ubwc" = "xyes"])
diff --git a/mm-core/Makefile.am b/mm-core/Makefile.am
index 8601b65..51f68da 100644
--- a/mm-core/Makefile.am
+++ b/mm-core/Makefile.am
@@ -50,6 +50,10 @@
 TARGET_REGISTRY = msm8953
 endif
 
+if TARGET_MSM8996
+TARGET_REGISTRY = msm8996
+endif
+
 c_sources +=src/${TARGET_REGISTRY}/registry_table_android.c
 
 lib_LTLIBRARIES = libOmxCore.la